arm64: zynqmp: Add i2c node selection to Kconfig

zcu100 revA is using different i2c then revB that's why add this quick
workaround by selecting i2c via defconfig. This should go away when i2c
cadence DM based driver is used.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index cc3dcc3f87500eb2910e679106cd04ad59fe8b80..45703cce021408e97b19c2c8e64a5a536718907e 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -136,4 +136,10 @@ config MINI_NAND
 config SPI_GENERIC
        bool
 
+config ZYNQ_I2C0
+       bool "Xilinx I2C0 controller"
+
+config ZYNQ_I2C1
+       bool "Xilinx I2C1 controller"
+
 endif

diff --git a/configs/xilinx_zynqmp_zcu100_revA_defconfig b/configs/xilinx_zynqmp_zcu100_revA_defconfig
index fb491463e4dbd0c5ad54cdb3f50e5e7d726ced2b..3d9c7da52823b68304c44fc876a6832a2987dfa2 100644 (file)
--- a/configs/xilinx_zynqmp_zcu100_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu100_revA_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_BOOT_INIT_FILE="board/xilinx/zynqmp/zynqmp-zcu100-revA/regs.txt"
 CONFIG_ZYNQMP_QSPI=y
 CONFIG_ZYNQMP_USB=y
+CONFIG_ZYNQ_I2C0=y
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU100 RevA"
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revA"

diff --git a/configs/xilinx_zynqmp_zcu100_revB_defconfig b/configs/xilinx_zynqmp_zcu100_revB_defconfig
index adc8483be01f35c856a6594012e8a360a077edba..f036373fbf2e618d706568674eb6ef731272e197 100644 (file)
--- a/configs/xilinx_zynqmp_zcu100_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu100_revB_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu100"
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_ZYNQMP_USB=y
+CONFIG_ZYNQ_I2C1=y
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU100 RevB"
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revB"

diff --git a/include/configs/xilinx_zynqmp_zcu100.h b/include/configs/xilinx_zynqmp_zcu100.h
index 556f609f2fc33b6113e11a0460fc6bb3b1821007..3569098f4704e83b41463ceee625a487d86b1083 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu100.h
+++ b/include/configs/xilinx_zynqmp_zcu100.h
@@ -11,7 +11,6 @@
 #define __CONFIG_ZYNQMP_ZCU100_H
 
 /* FIXME Will go away soon */
-#define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_MAX_HOPS                1
 #define CONFIG_SYS_NUM_I2C_BUSES       9
 #define CONFIG_SYS_I2C_BUSES   { \