diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index 779d9cfd0c7..c61d78e2feb 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -40,6 +40,7 @@ CONFIG_DM=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_MTD_DEVICE=y CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 9abb1851fa2..026355ebe04 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_MTD_DEVICE=y CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index a81585f129a..f4201b8b3ad 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -40,6 +40,7 @@ CONFIG_DM=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index c71594c13ab..5dad8ef0e58 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DA8XX_GPIO=y +CONFIG_SYS_I2C_DAVINCI=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_DAVINCI=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index ad4ed129d67..d539eb0cbf6 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index 69a833c57a7..665030b885a 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 0c025d8daab..f7f03903dbd 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y # CONFIG_BLK is not set +CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index ca7ab97cf94..b2016b62865 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y # CONFIG_BLK is not set +CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 9a2ed9a1522..c00f013baea 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index c09929c9b80..d8fa7284dd9 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 69547c446a8..8ec43e6935d 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index 450b65cbd2e..f3e715c05e5 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -27,6 +27,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig index 7296603d6eb..7b8f16903cd 100644 --- a/configs/legoev3_defconfig +++ b/configs/legoev3_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_DIAG=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 8eedc109013..e8c6cf03bcd 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -36,6 +36,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 5eceab9ea81..ae3b5015551 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -96,6 +96,12 @@ config SYS_I2C_CADENCE Say yes here to select Cadence I2C Host Controller. This controller is e.g. used by Xilinx Zynq. +config SYS_I2C_DAVINCI + bool "Davinci I2C Controller" + depends on (ARCH_KEYSTONE || ARCH_DAVINCI) + help + Say yes here to add support for Davinci and Keystone I2C controller + config SYS_I2C_DW bool "Designware I2C Controller" default n diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 29d4b80ec62..7e52fea2a1c 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -138,7 +138,6 @@ * I2C Configuration */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 #endif diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 79c624a3748..a644e678166 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -59,7 +59,6 @@ * I2C Configuration */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 100000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 33e876efdf6..c631e26785b 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -54,7 +54,6 @@ * I2C Configuration */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 400000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index b1b71335831..39fdf063f2b 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -130,7 +130,6 @@ /* * I2C Configuration */ -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 25000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 68f51d8526f..cc823c51469 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -141,7 +141,6 @@ #define CONFIG_AEMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE /* I2C Configuration */ -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 100000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 0x10 /* SMBus host address */ #define CONFIG_SYS_DAVINCI_I2C_SPEED1 100000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6bec453dbd1..fc37099cbe0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3051,7 +3051,6 @@ CONFIG_SYS_I2C_BASE4 CONFIG_SYS_I2C_BASE5 CONFIG_SYS_I2C_BUSES CONFIG_SYS_I2C_CLK_OFFSET -CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_BUS_NUM