Convert CONFIG_SYS_I2C_OMAP24XX to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_I2C_OMAP24XX

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 013586edd97fbf98935f46e4b8bfed07e1c87d6f..89c91d1b7782796d3cb221cc9dd06019acc20904 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -22,6 +22,7 @@ config OMAP34XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        imply TWL4030_POWER
 
@@ -40,6 +41,7 @@ config OMAP44XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
 
 config OMAP54XX
@@ -59,6 +61,7 @@ config OMAP54XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
 
 config TI814X
        bool "TI814X SoC"
@@ -82,6 +85,7 @@ config AM43XX
        imply SPL_OF_TRANSLATE
        imply SPL_SEPARATE_BSS
        imply SPL_SYS_MALLOC_SIMPLE
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        help
          Support for AM43xx SOC from Texas Instruments.
@@ -92,6 +96,7 @@ config AM43XX
 
 config AM33XX
        bool "AM33XX SoC"
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        imply USE_TINY_PRINTF
        help

diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
index 0f9b905bed7d75a0acf62f950642966e01cbb12c..9d4be2af1d222b2abe1996ddbe093833d5d51a50 100644 (file)
--- a/configs/ti816x_evm_defconfig
+++ b/configs/ti816x_evm_defconfig
@@ -39,6 +39,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_OMAP24XX=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 # CONFIG_USE_PRIVATE_LIBGCC is not set

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 8ac1cc6a15e76faf88a0812cd419402ca117952a..720e82d5ded11fce156d6ca73c8bcabb8fa304c6 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -145,6 +145,12 @@ config SYS_I2C_MXC
          channels and operating on standard mode upto 100 kbits/s and fast
          mode upto 400 kbits/s.
 
+config SYS_I2C_OMAP24XX
+       bool "TI OMAP2+ I2C driver"
+       depends on ARCH_OMAP2PLUS
+       help
+         Add support for the OMAP2+ I2C driver.
+
 config SYS_I2C_ROCKCHIP
        bool "Rockchip I2C driver"
        depends on DM_I2C

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index eb1fa5f3f5b3bafedd03ab1c5a83aa6083016385..aeba61ea59ebdd886ed645d957a1b01859703aa7 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -103,7 +103,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /*
  * Board NAND Info.

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 42e4053ffd6a908daacbc50a095065c81ef183cb..60460c8105eced60eb17f5e9ccef715d3585a264 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -91,7 +91,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /* Ethernet */
 #define CONFIG_DRIVER_TI_EMAC

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index b8c531ec29445645fc34044af86132d69a3424dc..f545a56d8272f00884ee8b7fdd78f098b8d8a3b2 100644 (file)
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -72,7 +72,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /*
  * Our platforms make use of SPL to initalize the hardware (primarily

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 1fae294b10c8c70d69e33a78fa4647c77c319146..f8f3c9224c3776fd98d1bfbf983c513f6db52884 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -93,7 +93,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_SYS_I2C_EEPROM_BUS      0

diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 2d289ac8132578aa5384d9dc7ef2d2e5864ec405..5821183fc9ca4e9341a93c5368147ef922f50a5a 100644 (file)
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -101,7 +101,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_SYS_I2C_EEPROM_BUS      0

diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index f6dab1e579ef92ed2c911d715df8594c660f78dd..feae29d145c0a3aa3a0d04e8a3232c3aa2e74daf 100644 (file)
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -17,7 +17,6 @@
 #include <configs/ti_omap5_common.h>
 
 /* EEPROM related defines */
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_SYS_I2C_EEPROM_BUS      0

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index d3a32caf53e806031021bf01d32a7513bc44869c..5b249d1f67f8b4fd9c68e1d7886286ea17c05ffa 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -65,8 +65,6 @@
 #undef CONFIG_OMAP3_SPI
 
 /* I2C */
-#undef CONFIG_SYS_I2C_OMAP24XX
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /* TWL4030 */
 #define CONFIG_TWL4030_LED             1

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index f040d0bbb6bce4add69a75d2708e192a599b7d3b..38c5862b7212832ad04411db4134b8bc2f35dc64 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -60,7 +60,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_I2C_MULTI_BUS
 
 /*

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 8fd3b31d851cb6845942ae2ac98521eb45835060..f25533446c276ad5dacf3725a712fa0709546b57 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -86,7 +86,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /* RTC */
 #define CONFIG_RTC_DS1337

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 481ec95e6e1d4f87fe1946e9e15aa7ae81fcbe4a..a06aec1f5f0f424ca1369dc9cc5757c1f07276d0 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -112,7 +112,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /*
  * TWL4030

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index de5af4bef4682d2dc1736acab5c49f17faee24ee..bc859c881185fc2dfddba52641856b3ca1c5c01e 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -143,7 +143,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /*
  * PISMO support

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index d4c1855cd25df747cd297c3cdf3a4a4c38d6dc9f..e5ffb8538113670587a9e09f7d0f5c71278368ce 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -53,7 +53,6 @@
 #define CONFIG_USB_OMAP3
 
 /* I2C */
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* EEPROM AT24C64      */
 
 /* USB */

diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index f9d450bf2c0a95516de927609a42bedea9774c80..bc4a59e1289822211aec43159b05bb091e9f833a 100644 (file)
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -34,7 +34,6 @@
 #define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + (128 << 15))
 
 /* I2C Support */
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /* TWL4030 LED */
 #define CONFIG_TWL4030_LED

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index e6d2a4fd5e50527b100ae44d87685cab437aebdb..53c53ef9ff3b3995853b3e21cb437fdbfac1cb4a 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -29,9 +29,6 @@
  * Hardware drivers
  */
 
-/* I2C Support */
-#define CONFIG_SYS_I2C_OMAP24XX
-
 /* TWL4030 LED */
 #define CONFIG_TWL4030_LED
 

diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 04b1def1ef5407c3bb1f877784e86648866c89e1..7f4f56f1716355e877a90aa9e98053c48f5d4c04 100644 (file)
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -63,9 +63,6 @@
 #endif
 #endif
 
-#undef CONFIG_SYS_I2C_OMAP24XX
-#define CONFIG_SYS_I2C_OMAP24XX
-
 /*
  * TWL4030
  */

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 22215fefc0c5aec5e5640b9b6a84405f93ac1e5b..5101d7065e109689103d7817192d1ac393edba12 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -104,7 +104,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index a4497accc02f6ff80eb012df78a8e693b18cc074..34f6d8ad72bf278313794104da57b7fde83a7e1d 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_I2C_MULTI_BUS
 
 /*

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index acc0bac72253e6f59eb93fb509313418666386b0..37f876755a7d0f5fd2602f442c63dd092f800db4 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -71,7 +71,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50            /* base address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1               /* bytes of address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW    0x07

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 49ea9671df0ae7b2f8574f30d5f86b02d21c7657..1f36ac69be3461dce16dbb9b9093fca6dd2b6153 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -69,7 +69,6 @@
                                        "4m(kernel),-(fs)"
 
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
 #define CONFIG_I2C_MULTI_BUS

diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h
index 85f1d968233e4a08b6d13a88f5138d49acd14163..6834500c172fa937a15b2cbda4444281cf4cd439 100644 (file)
--- a/include/configs/ti_armv7_omap.h
+++ b/include/configs/ti_armv7_omap.h
@@ -15,7 +15,6 @@
 /* I2C IP block */
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
 
 /* SPI IP Block */
 #define CONFIG_OMAP3_SPI

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 1a6551e24d20bde8c89a56e377d04b034df5e86e..acfac24ebe1406c60e607b4fae44c4cd32a5d368 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -150,7 +150,6 @@
 #ifdef CONFIG_SPL_BUILD
 /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */
 #undef CONFIG_SYS_I2C
-#undef CONFIG_SYS_I2C_OMAP24XX
 #endif
 
 #endif /* __CONFIG_TI_OMAP4_COMMON_H */

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 02fa5c833c2145337e51a843ab5ea3aa6250b8b2..fbdd43ac728e27cc41e56b7cac824d348dc4fb00 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP24XX
  
 
 /* EEPROM */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2998cf9438aa7b8b3c32293d0bd8f21763051767..4689d6310f0c39c3346188c1a93f417a708af037 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3530,7 +3530,6 @@ CONFIG_SYS_I2C_MXC_I2C4
 CONFIG_SYS_I2C_NCT72_ADDR
 CONFIG_SYS_I2C_NOPROBES
 CONFIG_SYS_I2C_OFFSET
-CONFIG_SYS_I2C_OMAP24XX
 CONFIG_SYS_I2C_PCA953X_ADDR
 CONFIG_SYS_I2C_PCA953X_ADDR0
 CONFIG_SYS_I2C_PCA953X_ADDR1