arm64: zynqmp: Switch all platfroms 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>

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index bcdb37ce378f7678cfafa49de12157be77ab7648..2a5cb3b7a1cc8e6be155a3d45a1de446dc5a9819 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -37,6 +37,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 1256d0bc476c07ec167cade58e95cc1e41d3abbf..153452a45d5bff926c804e5dc4e87b6b96502a33 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -35,6 +35,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 565c2062e4ae4c57a84145884d461e56c8bd2070..bc7072b7d06c7fe0c8132cb679011cbf1a5b9762 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -37,6 +37,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 38adeb4019607aad44e2de34847dfe04ab060167..8d568859fad870986789f9486f40f88225dc568f 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -36,6 +36,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 8137afdc9412e20ee8b16cbe2cb86b664d5abb49..5d0980d5d2e3bc3f115c7949bfdd5e610d7b761a 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 ef8e1da6c7c10efe95ff176fcd9f8631850d7b40..166bfd8b3f8fffe034eb0273a40aaa2b23846a62 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 5529bc8b82f5bdac2caf32befeae3ebddb84604c..a499d81f3683eb4fb20ad86ea54c2d15dc64c29a 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
@@ -61,15 +60,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 76209b5d6d8aba757a65ee0ef16c6db97933577b..9e7ccde27cab6938286afd7d93357c4abac98791 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 97f2c7cd2186d6a8ca9f3b7c13e539458321041c..cfb685f29511bfa7e551d1b0cc7a720819457b0a 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 55994c742614e32d433479d518e489d35cfbb85d..71b8891549b3b7c0a00997d04441323c775c7622 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 396e12aafbe104242c69623d55b05ee26d13388f..e25903825d92823d5660396342d559a6cda18022 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 ff8f07eefc14b13666057081a844984797f3b302..9095a1026d6ba6605884e9f7394d6b61f5fdebd7 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 85051fce684005797ed481c6eced0797c91c879b..3bc0d570301ea29da15ec6fd88317938f2465640 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 6fdf7eecf972a3045d42f8135b4a2ba4eb0bbb43..8bb4ee769ea9caf5ff01baa1cb6bfcf1d35f2384 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -198,11 +198,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>