From: Michal Simek Date: Fri, 10 Feb 2017 07:13:56 +0000 (+0100) Subject: arm64: zynqmp: Add i2c node selection to Kconfig X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d07a9364e278bd602e3ff661f65156b8f2c8f7c;p=thirdparty%2Fu-boot.git 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 --- diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig index cc3dcc3f875..45703cce021 100644 --- 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 fb491463e4d..3d9c7da5282 100644 --- 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 adc8483be01..f036373fbf2 100644 --- 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 556f609f2fc..3569098f470 100644 --- 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 { \