ARM64: zynqmp: Use i2c cadence DM driver

Use i2c cadence DM driver for all zynqmp targets except ZCU102 because I2C muxes and PCA953x are not supported in the tree yet.

Signed-off-by Michal Simek <[email protected]>

---

  configs/xilinx_zynqmp_ep_defconfig               | 3 +++
  configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 3 +++
  configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 3 +++
  configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 3 +++
  include/configs/xilinx_zynqmp_ep.h               | 2 --
  include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 2 --
  include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h | 2 --
  include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h | 3 ---
  8 files changed, 12 insertions(+), 9 deletions(-)

configs/xilinx_zynqmp_ep_defconfig +3 -0

index b45c7f281c2f..daafb616c851 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_ep"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_DM_I2C=y
  CONFIG_DM_GPIO=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000

@@ -17,6 +18,7 @@ CONFIG_SYS_PROMPT="ZynqMP> "
  # CONFIG_CMD_ENV_EXISTS is not set
  # CONFIG_CMD_LOADB is not set
  # CONFIG_CMD_LOADS is not set
+CONFIG_CMD_I2C=y
  # CONFIG_CMD_FPGA is not set
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_ITEST is not set

@@ -29,6 +31,7 @@ CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
  CONFIG_ZYNQ_SDHCI=y
  CONFIG_NAND_ARASAN=y

configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +3 -0

index 4a62a8667940..366aba227962 100644
@@ -1,6 +1,7 @@
  CONFIG_ARM=y
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm015_dc1"
  CONFIG_ARCH_ZYNQMP=y
+CONFIG_DM_I2C=y
  CONFIG_DM_GPIO=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000

@@ -11,6 +12,7 @@ CONFIG_SYS_PROMPT="ZynqMP> "
  # CONFIG_CMD_IMLS is not set
  CONFIG_CMD_MEMTEST=y
  # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_TFTPPUT=y
  CONFIG_CMD_DHCP=y

@@ -19,6 +21,7 @@ CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
  CONFIG_ZYNQ_SDHCI=y
  CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +3 -0

index c4da7b110fbb..6197ad580afa 100644
@@ -1,6 +1,7 @@
  CONFIG_ARM=y
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm016_dc2"
  CONFIG_ARCH_ZYNQMP=y
+CONFIG_DM_I2C=y
  CONFIG_DM_GPIO=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000

@@ -11,6 +12,7 @@ CONFIG_SYS_PROMPT="ZynqMP> "
  # CONFIG_CMD_IMLS is not set
  CONFIG_CMD_MEMTEST=y
  # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_I2C=y
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_TFTPPUT=y
  CONFIG_CMD_DHCP=y

@@ -19,6 +21,7 @@ CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
  CONFIG_NAND_ARASAN=y
  CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +3 -0

index 8bbee1bc94a2..a9b68de45d21 100644
@@ -1,6 +1,7 @@
  CONFIG_ARM=y
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm019_dc5"
  CONFIG_ARCH_ZYNQMP=y
+CONFIG_DM_I2C=y
  CONFIG_DM_GPIO=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm019-dc5"

@@ -10,12 +11,14 @@ CONFIG_SYS_PROMPT="ZynqMP> "
  # CONFIG_CMD_IMLS is not set
  CONFIG_CMD_MEMTEST=y
  # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_I2C=y
  CONFIG_CMD_TFTPPUT=y
  CONFIG_CMD_DHCP=y
  CONFIG_CMD_PING=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
  CONFIG_OF_EMBED=y
+CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
  CONFIG_ZYNQ_SDHCI=y
  CONFIG_DM_ETH=y

include/configs/xilinx_zynqmp_ep.h +0 -2

index 4a83eee6d0b8..95063557137b 100644
@@ -15,8 +15,6 @@
 
  #define CONFIG_ZYNQ_SDHCI_MAX_FREQ	52000000
  #define CONFIG_ZYNQ_SDHCI_MIN_FREQ	(CONFIG_ZYNQ_SDHCI_MAX_FREQ << 9)
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_SYS_I2C_ZYNQ
  #define CONFIG_ZYNQ_EEPROM
  #define CONFIG_AHCI
  #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \

include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h +0 -2

index 7aa993688158..3c0ba883dbba 100644
@@ -12,8 +12,6 @@
 
  #define CONFIG_ZYNQ_SDHCI0
  #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_ZYNQ_I2C1
-#define CONFIG_SYS_I2C_ZYNQ
  #define CONFIG_AHCI
  #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
 

include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h +0 -2

index 2727dc6e0708..83ea624c51c4 100644
@@ -10,8 +10,6 @@
  #ifndef __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H
  #define __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H
 
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_SYS_I2C_ZYNQ
  #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB1_XHCI_BASEADDR}
 
  #define CONFIG_IDENT_STRING	" Xilinx ZynqMP ZC1751 xm016 dc2"

include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h +0 -3

index d9409bad6552..4f8f5c10536d 100644
@@ -12,9 +12,6 @@
  #define __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
 
  #define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
-#define CONFIG_SYS_I2C_ZYNQ
 
  #define CONFIG_IDENT_STRING	" Xilinx ZynqMP ZC1751 xm019 dc5"