arm64: zynqmp: Switch all platforms to DM_I2C

CONFIG_PCA953X is not needed because of PCA953X is integrated in gpio
subsystem already. That's why also remove CMD_PCA953X which is only for
this driver.

zcu102/zcu104-revC/zcu106/zcu111 contain links to eeprom which stores MAC address.

DM_I2C is not enabled for the whole SoC because it increase size for
mini configurations and there is no I2C symbol present to setup
dependencies.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index 05be919f6f9b3f5344bc93654c0c144a7ee1b8c1..1b28d331ff5eb065cae32306ac5dfbd58372ad5d 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -36,6 +36,7 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
+               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index becc6a0fe1ef2c843271efe9ea2949d024059216..623d2c96cda4f193777dcf67bfadb282d0862cfd 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -34,6 +34,7 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
+               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 7735e9d2c8b3ba6d343a9b83dbe1eb41a27ef6a7..3d5c99ad628cdf85a98132cc621d8eb2b667d96b 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -36,6 +36,7 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
+               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 172e6cc2ca068c2782c9f134debc266fc3e346c2..f7d6fe0073b27592b3a0243bcfc381d01e2fb22d 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -35,6 +35,7 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
+               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/configs/avnet_ultra96_rev1_defconfig b/configs/avnet_ultra96_rev1_defconfig
index 3c0f2a54afe8baa9d56ded1ad6763785e40a9847..b0d416e52c4dbdb5a93e96180b2850a8e84542e8 100644 (file)
--- a/configs/avnet_ultra96_rev1_defconfig
+++ b/configs/avnet_ultra96_rev1_defconfig
@@ -49,8 +49,10 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
 CONFIG_XILINX_GPIO=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y

diff --git a/configs/xilinx_zynqmp_zcu100_revC_defconfig b/configs/xilinx_zynqmp_zcu100_revC_defconfig
index a3c81eb7e97fda53bfedac4941b480a20d819e34..2a0ec272a01def2fc1663d168248d2e69a402b48 100644 (file)
--- a/configs/xilinx_zynqmp_zcu100_revC_defconfig
+++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig
@@ -49,8 +49,10 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
 CONFIG_XILINX_GPIO=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y

diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
index ac1710195a2b4f5b567d0aeb1b384966b4474ab0..ba0f6b2aeb3a96979f92e14f9b76ed4f785694c9 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
@@ -23,7 +23,6 @@ CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_ATF=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 CONFIG_CMD_CLK=y
@@ -60,15 +59,18 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
-CONFIG_CMD_PCA953X=y
 CONFIG_XILINX_GPIO=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C0=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_SDHCI=y

diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
index 604e8c9f71e352f106fa8d20d623fd32a618fe5f..2e1e3c2bf50c7ad62f8b805a62c84aebb231cc47 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
@@ -23,7 +23,6 @@ CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_ATF=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 CONFIG_CMD_CLK=y
@@ -60,15 +59,19 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
-CONFIG_CMD_PCA953X=y
 CONFIG_XILINX_GPIO=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C0=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index d0155b1d4feef5224832cffd5a4b15e1dddafdf3..78ab9465d858c888ce662b1cf8e6d4b44e0e28cb 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -23,7 +23,6 @@ CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_ATF=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 CONFIG_CMD_CLK=y
@@ -60,15 +59,19 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
-CONFIG_CMD_PCA953X=y
 CONFIG_XILINX_GPIO=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C0=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/xilinx_zynqmp_zcu104_revA_defconfig b/configs/xilinx_zynqmp_zcu104_revA_defconfig
index 06c3ca3db69619ec2dd9a53fbdebdd570de58e8e..4e649ae6a2ca0835e1644be01ba3ffcb05c5e608 100644 (file)
--- a/configs/xilinx_zynqmp_zcu104_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu104_revA_defconfig
@@ -19,7 +19,6 @@ CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_ATF=y
 CONFIG_SYS_PROMPT="ZynqMP> "
-CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DFU=y
@@ -50,10 +49,14 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
-CONFIG_CMD_PCA953X=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/xilinx_zynqmp_zcu104_revC_defconfig b/configs/xilinx_zynqmp_zcu104_revC_defconfig
index d615cb04f40deab0b82928638819500128994db3..d451cb039376b9ed5f4ab69dc01ff226c82cf6ae 100644 (file)
--- a/configs/xilinx_zynqmp_zcu104_revC_defconfig
+++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig
@@ -19,7 +19,6 @@ CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_ATF=y
 CONFIG_SYS_PROMPT="ZynqMP> "
-CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DFU=y
@@ -50,11 +49,15 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
-CONFIG_CMD_PCA953X=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/xilinx_zynqmp_zcu106_revA_defconfig b/configs/xilinx_zynqmp_zcu106_revA_defconfig
index 9f5f97500844a4d6831c0e015a525fa335302a25..cf25e760a37b88797473672afa4fff380f216900 100644 (file)
--- a/configs/xilinx_zynqmp_zcu106_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig
@@ -22,7 +22,6 @@ CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_ATF=y
 CONFIG_SYS_PROMPT="ZynqMP> "
 CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DFU=y
@@ -57,14 +56,17 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
-CONFIG_CMD_PCA953X=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C0=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y

diff --git a/configs/xilinx_zynqmp_zcu111_revA_defconfig b/configs/xilinx_zynqmp_zcu111_revA_defconfig
index 40586771a035fc226a0c16ef48bb78db1dc1b186..eacd88e007ed8197b48ba29323e19f18e54df441 100644 (file)
--- a/configs/xilinx_zynqmp_zcu111_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu111_revA_defconfig
@@ -19,7 +19,6 @@ CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_ATF=y
 CONFIG_SYS_PROMPT="ZynqMP> "
-CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DFU=y
@@ -49,14 +48,17 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
-CONFIG_CMD_PCA953X=y
-CONFIG_SYS_I2C_ZYNQ=y
-CONFIG_ZYNQ_I2C0=y
-CONFIG_ZYNQ_I2C1=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index d83c1100b85afb9cea1973fe3cc44f745270a1c7..27a8e4d4906d0c22685a942b1f1dca61c283eafb 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -108,11 +108,6 @@
 # define PHY_ANEG_TIMEOUT       20000
 #endif
 
-/* I2C */
-#if defined(CONFIG_SYS_I2C_ZYNQ)
-# define CONFIG_SYS_I2C
-#endif
-
 /* EEPROM */
 #ifdef CONFIG_ZYNQMP_EEPROM
 # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN                2

diff --git a/include/configs/xilinx_zynqmp_zcu100.h b/include/configs/xilinx_zynqmp_zcu100.h
index 5ad9e1be5af9df9ee6869ee5a69379ac68cf5863..409dcb2651d7d4d24f64c5ea930fc7810d295b4b 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu100.h
+++ b/include/configs/xilinx_zynqmp_zcu100.h
@@ -9,21 +9,6 @@
 #ifndef __CONFIG_ZYNQMP_ZCU100_H
 #define __CONFIG_ZYNQMP_ZCU100_H
 
-/* FIXME Will go away soon */
-#define CONFIG_SYS_I2C_MAX_HOPS                1
-#define CONFIG_SYS_NUM_I2C_BUSES       9
-#define CONFIG_SYS_I2C_BUSES   { \
-                               {0, {I2C_NULL_HOP} }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 0} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 1} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 2} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 3} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 4} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 5} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 6} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x75, 7} } }, \
-                               }
-
 #include <configs/xilinx_zynqmp.h>
 
 #endif /* __CONFIG_ZYNQMP_ZCU100_H */

diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
index ad6bc3d1bf119d86ce66bf8ba19d9749f5b90235..f1504784fdd66c298d596cdab455f345b58936fb 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ b/include/configs/xilinx_zynqmp_zcu102.h
@@ -10,35 +10,6 @@
 #define __CONFIG_ZYNQMP_ZCU102_H
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_SYS_I2C_MAX_HOPS                1
-#define CONFIG_SYS_NUM_I2C_BUSES       18
-#define CONFIG_SYS_I2C_BUSES   { \
-                               {0, {I2C_NULL_HOP} }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \
-                               {1, {I2C_NULL_HOP} }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \
-                               }
-
-#define CONFIG_PCA953X
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_EEPROM_BUS         5
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x54
-
 #define CONFIG_SPD_EEPROM
 #define CONFIG_DDR_SPD
 

diff --git a/include/configs/xilinx_zynqmp_zcu104.h b/include/configs/xilinx_zynqmp_zcu104.h
index 7e3b9ad7058b637996f5010123cd72e15e72bd53..9d40955d5d366a1daa9387869346adcb44aa56a9 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu104.h
+++ b/include/configs/xilinx_zynqmp_zcu104.h
@@ -10,23 +10,6 @@
 #define __CONFIG_ZYNQMP_ZCU104_H
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_SYS_I2C_MAX_HOPS                1
-#define CONFIG_SYS_NUM_I2C_BUSES       9
-#define CONFIG_SYS_I2C_BUSES   { \
-                               {0, {I2C_NULL_HOP} }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 0} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 1} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 2} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 3} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 4} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 5} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 6} } }, \
-                               {0, {{I2C_MUX_PCA9548, 0x74, 7} } }, \
-                               }
-
-#define CONFIG_PCA953X
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 
 #include <configs/xilinx_zynqmp.h>
 

diff --git a/include/configs/xilinx_zynqmp_zcu104_revC.h b/include/configs/xilinx_zynqmp_zcu104_revC.h
index 8b3ae36d0f32a8d937eba9dc492c62a5a42f2c40..e3059a921e6597e887b6d793c1958a0199b57ab4 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu104_revC.h
+++ b/include/configs/xilinx_zynqmp_zcu104_revC.h
@@ -11,7 +11,4 @@
 
 #include <configs/xilinx_zynqmp_zcu104.h>
 
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54
-#define CONFIG_ZYNQ_EEPROM_BUS 1
-
 #endif /* __CONFIG_ZYNQMP_ZCU104_REVC_H */

diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h
index cc2d145ddd9435bdf2914bac2cff40078b4eb8d4..dc2efc7e059a28291a3dc5956126e77c9d6fd733 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu106.h
+++ b/include/configs/xilinx_zynqmp_zcu106.h
@@ -10,34 +10,6 @@
 #define __CONFIG_ZYNQMP_ZCU106_H
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_SYS_I2C_MAX_HOPS                1
-#define CONFIG_SYS_NUM_I2C_BUSES       18
-#define CONFIG_SYS_I2C_BUSES   { \
-                               {0, {I2C_NULL_HOP} }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \
-                               {1, {I2C_NULL_HOP} }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \
-                               }
-
-#define CONFIG_PCA953X
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_EEPROM_BUS         5
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x54
 
 #include <configs/xilinx_zynqmp.h>
 

diff --git a/include/configs/xilinx_zynqmp_zcu111.h b/include/configs/xilinx_zynqmp_zcu111.h
index 8f8cb4f087079ce41c8c8c3ea9d7f09be04f4c2c..dea5e4a4d4138e315e075a9f513e99a50762d9a6 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu111.h
+++ b/include/configs/xilinx_zynqmp_zcu111.h
@@ -10,37 +10,6 @@
 #define __CONFIG_ZYNQMP_ZCU111_H
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_SYS_I2C_MAX_HOPS                1
-#define CONFIG_SYS_NUM_I2C_BUSES       21
-#define CONFIG_SYS_I2C_BUSES   { \
-                               {0, {I2C_NULL_HOP} }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \
-                               {0, {{I2C_MUX_PCA9544, 0x75, 3} } }, \
-                               {1, {I2C_NULL_HOP} }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 5} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x74, 6} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \
-                               {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \
-                               }
-
-#define CONFIG_PCA953X
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_EEPROM_BUS         5
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x54
 
 #include <configs/xilinx_zynqmp.h>