Configs: Migrate CONFIG_SYS_I2C_OMAP34XX to CONFIG_SYS_I2C_OMAP24XX

The driver is for all boards 24XX and up, so let's eliminate the
extra option called CONFIG_SYS_I2C_OMAP34XX since the driver checks
for CONFIG_OMAP34XX we don't need CONFIG_SYS_I2C_OMAP34XX.

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

diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c
index 006969e..3daae61 100644 (file)
--- a/arch/arm/mach-omap2/omap3/clock.c
+++ b/arch/arm/mach-omap2/omap3/clock.c
@@ -772,7 +772,7 @@ void per_clocks_enable(void)
        setbits_le32(&prcm_base->iclken_per, 0x00020000);
 #endif
 
-#ifdef CONFIG_SYS_I2C_OMAP34XX
+#ifdef CONFIG_SYS_I2C_OMAP24XX
        /* Turn on all 3 I2C clocks */
        setbits_le32(&prcm_base->fclken1_core, 0x00038000);
        setbits_le32(&prcm_base->iclken1_core, 0x00038000); /* I2C1,2,3 = on */

diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index f169125..da67098 100644 (file)
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -398,7 +398,7 @@ void board_mmc_power_init(void)
 }
 #endif
 
-#ifdef CONFIG_SYS_I2C_OMAP34XX
+#ifdef CONFIG_SYS_I2C_OMAP24XX
 /*
  * Routine: reset_net_chip
  * Description: reset the Ethernet controller via TPS65930 GPIO

diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index 5d2d997..c18a5a3 100644 (file)
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -105,7 +105,7 @@ int misc_init_r(void)
        volatile unsigned int ctr;
        u32 reset;
 
-#ifdef CONFIG_SYS_I2C_OMAP34XX
+#ifdef CONFIG_SYS_I2C_OMAP24XX
        i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 

diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index 5fa319d..136cc43 100644 (file)
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -43,7 +43,7 @@ int board_init(void)
  */
 int misc_init_r(void)
 {
-#ifdef CONFIG_SYS_I2C_OMAP34XX
+#ifdef CONFIG_SYS_I2C_OMAP24XX
        i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 

diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index fe8e793..a6c5a3d 100644 (file)
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -147,7 +147,7 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
 int misc_init_r(void)
 {
 
-#ifdef CONFIG_SYS_I2C_OMAP34XX
+#ifdef CONFIG_SYS_I2C_OMAP24XX
        i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 4bbf0c9..4f75419 100644 (file)
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -31,7 +31,6 @@ obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o
 obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o
 obj-$(CONFIG_SYS_I2C_MXS) += mxs_i2c.o
 obj-$(CONFIG_SYS_I2C_OMAP24XX) += omap24xx_i2c.o
-obj-$(CONFIG_SYS_I2C_OMAP34XX) += omap24xx_i2c.o
 obj-$(CONFIG_SYS_I2C_RCAR) += rcar_i2c.o
 obj-$(CONFIG_SYS_I2C_ROCKCHIP) += rk_i2c.o
 obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o exynos_hs_i2c.o

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

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

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index bdbbfdd..1fae294 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -93,7 +93,7 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 93bf04f..2d289ac 100644 (file)
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -101,7 +101,7 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 8a4c333..f6dab1e 100644 (file)
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -17,7 +17,7 @@
 #include <configs/ti_omap5_common.h>
 
 /* EEPROM related defines */
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 fb9e4c6..d3a32ca 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -66,7 +66,7 @@
 
 /* I2C */
 #undef CONFIG_SYS_I2C_OMAP24XX
-#define CONFIG_SYS_I2C_OMAP34XX
+#define CONFIG_SYS_I2C_OMAP24XX
 
 /* TWL4030 */
 #define CONFIG_TWL4030_LED             1

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 9138452..8fd3b31 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -86,7 +86,7 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 9826514..481ec95 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -112,7 +112,7 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
+#define CONFIG_SYS_I2C_OMAP24XX
 
 /*
  * TWL4030

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

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 2ab74cb..d4c1855 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -53,7 +53,7 @@
 #define CONFIG_USB_OMAP3
 
 /* I2C */
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 133069a..f9d450b 100644 (file)
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -34,7 +34,7 @@
 #define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + (128 << 15))
 
 /* I2C Support */
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 b7ab628..e6d2a4f 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -30,7 +30,7 @@
  */
 
 /* I2C Support */
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 b862924..04b1def 100644 (file)
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -64,7 +64,7 @@
 #endif
 
 #undef CONFIG_SYS_I2C_OMAP24XX
-#define CONFIG_SYS_I2C_OMAP34XX
+#define CONFIG_SYS_I2C_OMAP24XX
 
 /*
  * TWL4030

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 669ce85..a4497ac 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -62,7 +62,7 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 b695d8d..acc0bac 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -71,7 +71,7 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
+#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 3dd7a9b..49ea967 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -69,7 +69,7 @@
                                        "4m(kernel),-(fs)"
 
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_OMAP34XX
+#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/tricorder.h b/include/configs/tricorder.h
index 6e80e5b..02fa5c8 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -62,7 +62,7 @@
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
-#define CONFIG_SYS_I2C_OMAP34XX
+#define CONFIG_SYS_I2C_OMAP24XX
  
 
 /* EEPROM */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2dacf79..2998cf9 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3531,7 +3531,6 @@ CONFIG_SYS_I2C_NCT72_ADDR
 CONFIG_SYS_I2C_NOPROBES
 CONFIG_SYS_I2C_OFFSET
 CONFIG_SYS_I2C_OMAP24XX
-CONFIG_SYS_I2C_OMAP34XX
 CONFIG_SYS_I2C_PCA953X_ADDR
 CONFIG_SYS_I2C_PCA953X_ADDR0
 CONFIG_SYS_I2C_PCA953X_ADDR1