Convert CONFIG_SYS_I2C_DAVINCI to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_I2C_DAVINCI

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index 779d9cfd0c72a9c5aa99b029f4027332d6f6aced..c61d78e2feb27b17d7b4edbac81e224d7d952feb 100644 (file)
--- 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 9abb1851fa2ad8ad2528a6d1dd3de44ee50109a8..026355ebe04f893638be101710a5c29cb4434cca 100644 (file)
--- 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 a81585f129af1ab3f244a2fb01e041680145652c..f4201b8b3addcee21ce4cf511380024e97f3c408 100644 (file)
--- 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 c71594c13abd87a6d1c684d16786880e1e5233ea..5dad8ef0e58323e2d7c459a9ec78f474bce1fe7b 100644 (file)
--- 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 ad4ed129d6794c088d5006e03b4fc104da658ce6..d539eb0cbf6bbd76848dde7b8f8e7cc4e7293c63 100644 (file)
--- 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 69a833c57a74685eddd6311a12ecd5ffdc77401f..665030b885a0f132d068139a7766b7d5d6c2f240 100644 (file)
--- 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 0c025d8daab35ed253a7957a5c51d5dae62ea18f..f7f03903dbd5310d51bc5f76fb30a6d80b9b6f68 100644 (file)
--- 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 ca7ab97cf949f47b10df5672364334c72f79e44e..b2016b62865a9d15053b08123b2a064a8410c2e5 100644 (file)
--- 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 9a2ed9a1522bc4242fe7d56b90d646bd52922fd8..c00f013baeaf4358f2950b34a7c86ece868296f1 100644 (file)
--- 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 c09929c9b8094f9fb61e66e0c5ce6d9d27b7f58c..d8fa7284dd9275f523202ce10d30234b42276abe 100644 (file)
--- 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 69547c446a87e03afa1afc9c192168d46a401f7b..8ec43e6935d35c44eb8409258f3819d3ff3fbe78 100644 (file)
--- 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 450b65cbd2e0db880a99bcae6ddaacae7b635660..f3e715c05e5799d1479ed56df6723edd93dc3a6f 100644 (file)
--- 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 7296603d6eb436646af922bf2e811c72019d7b51..7b8f16903cd047037dd9a827bbd0dfec250c6dfa 100644 (file)
--- 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 8eedc109013a2ed95c48bf7d711d2d877a1f2f43..e8c6cf03bcdcd592549968f546a4b249876daedb 100644 (file)
--- 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 5eceab9ea81497753adbd888c938e0c5975a9063..ae3b501555167d78ea1ec9fd7164f1ea5e870877 100644 (file)
--- 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 29d4b80ec62295d8e8ecfeba1c35836f0fa3ddf1..7e52fea2a1c4fc1320b318e53550a1ec4d66819d 100644 (file)
--- 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 79c624a37480f9a137f722f08c4405871ff46b5c..a644e6781666614223dca5656c0b6f2c7490e783 100644 (file)
--- 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 33e876efdf6324cec9fde89060f85971f4e44144..c631e26785bdd9f16518b0142afe7f90dfebe178 100644 (file)
--- 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 b1b71335831c0c05f9e68adcb382331419218737..39fdf063f2bca995df92b0dafd76ecc95a24be84 100644 (file)
--- 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 68f51d8526f6be52fa67b224f736775ea25aafc0..cc823c51469b31fe53c00be5a667eafefa4df59a 100644 (file)
--- 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 6bec453dbd1c2ec1329bbef779aa22437f4c9061..fc37099cbe0e464bfc5a3c6ac802753532ad6f66 100644 (file)
--- 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