Configs: Migrate CONFIG_SYS_I2C_OMAP34XX to CONFIG_SYS_I2C_OMAP24XX

PATCH New Adam Ford 2 participants 3 messages Aug 7, 2017 – Aug 10, 2017

Subsystems (4)

Arm (32-bit) Arm sub-architectures OMAP2+ support I2C

lore

Share & tools

lore

Adam Ford

author

2017-08-07 18:11 UTC #0 lore raw

PATCH 1/2 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 <[email protected]>

---
 arch/arm/mach-omap2/omap3/clock.c   | 2 +-
 board/compulab/cm_t35/cm_t35.c      | 2 +-
 board/logicpd/am3517evm/am3517evm.c | 2 +-
 board/ti/am3517crane/am3517crane.c  | 2 +-
 board/ti/evm/evm.c                  | 2 +-
 drivers/i2c/Makefile                | 1 -
 include/configs/am3517_crane.h      | 2 +-
 include/configs/am3517_evm.h        | 2 +-
 include/configs/cm_t35.h            | 2 +-
 include/configs/cm_t3517.h          | 2 +-
 include/configs/cm_t54.h            | 2 +-
 include/configs/devkit8000.h        | 2 +-
 include/configs/mcx.h               | 2 +-
 include/configs/nokia_rx51.h        | 2 +-
 include/configs/omap3_evm.h         | 2 +-
 include/configs/omap3_logic.h       | 2 +-
 include/configs/omap3_overo.h       | 2 +-
 include/configs/omap3_pandora.h     | 2 +-
 include/configs/omap3_zoom1.h       | 2 +-
 include/configs/sniper.h            | 2 +-
 include/configs/tam3517-common.h    | 2 +-
 include/configs/tao3530.h           | 2 +-
 include/configs/tricorder.h         | 2 +-
 scripts/config_whitelist.txt        | 1 -
 24 files changed, 22 insertions(+), 24 deletions(-)

arch/arm/mach-omap2/omap3/clock.c +1 -1

index 006969e..3daae61 100644
@@ -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 */

board/compulab/cm_t35/cm_t35.c +1 -1

index f169125..da67098 100644
@@ -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

board/logicpd/am3517evm/am3517evm.c +1 -1

index 5d2d997..c18a5a3 100644
@@ -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

board/ti/am3517crane/am3517crane.c +1 -1

index 5fa319d..136cc43 100644
@@ -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

board/ti/evm/evm.c +1 -1

index fe8e793..a6c5a3d 100644
@@ -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

drivers/i2c/Makefile +0 -1

index 4bbf0c9..4f75419 100644
@@ -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

include/configs/am3517_crane.h +1 -1

index 36adea7..eb1fa5f 100644
@@ -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.

include/configs/am3517_evm.h +1 -1

index 2f2e13c..42e4053 100644
@@ -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

include/configs/cm_t35.h +1 -1

index bdbbfdd..1fae294 100644
@@ -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

include/configs/cm_t3517.h +1 -1

index 93bf04f..2d289ac 100644
@@ -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

include/configs/cm_t54.h +1 -1

index 8a4c333..f6dab1e 100644
@@ -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

include/configs/devkit8000.h +1 -1

index fb9e4c6..d3a32ca 100644
@@ -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

include/configs/mcx.h +1 -1

index 9138452..8fd3b31 100644
@@ -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

include/configs/nokia_rx51.h +1 -1

index 9826514..481ec95 100644
@@ -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

include/configs/omap3_evm.h +1 -1

index 70cd0ea..de5af4b 100644
@@ -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

include/configs/omap3_logic.h +1 -1

index 2ab74cb..d4c1855 100644
@@ -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 */

include/configs/omap3_overo.h +1 -1

index 133069a..f9d450b 100644
@@ -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

include/configs/omap3_pandora.h +1 -1

index b7ab628..e6d2a4f 100644
@@ -30,7 +30,7 @@
  */
 
 /* I2C Support */
-#define CONFIG_SYS_I2C_OMAP34XX
+#define CONFIG_SYS_I2C_OMAP24XX
 
 /* TWL4030 LED */
 #define CONFIG_TWL4030_LED

include/configs/omap3_zoom1.h +1 -1

index b862924..04b1def 100644
@@ -64,7 +64,7 @@
 #endif
 
 #undef CONFIG_SYS_I2C_OMAP24XX
-#define CONFIG_SYS_I2C_OMAP34XX
+#define CONFIG_SYS_I2C_OMAP24XX
 
 /*
  * TWL4030

include/configs/sniper.h +1 -1

index 669ce85..a4497ac 100644
@@ -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
 
 /*

include/configs/tam3517-common.h +1 -1

index b695d8d..acc0bac 100644
@@ -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

include/configs/tao3530.h +1 -1

index 3dd7a9b..49ea967 100644
@@ -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

include/configs/tricorder.h +1 -1

index 6e80e5b..02fa5c8 100644
@@ -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 */

scripts/config_whitelist.txt +0 -1

index 3b5c17a..6c7c132 100644
@@ -3534,7 +3534,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

Signature · 1 line

2.7.4

Heiko Schocher

2017-08-09 04:00 UTC #1 lore raw

PATCH 1/2 Configs: Migrate CONFIG_SYS_I2C_OMAP34XX to CONFIG_SYS_I2C_OMAP24XX

Hello Adam,

Am 07.08.2017 um 20:11 schrieb Adam Ford:

Quoted 23 lines

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 <[email protected]>

---
  arch/arm/mach-omap2/omap3/clock.c   | 2 +-
  board/compulab/cm_t35/cm_t35.c      | 2 +-
  board/logicpd/am3517evm/am3517evm.c | 2 +-
  board/ti/am3517crane/am3517crane.c  | 2 +-
  board/ti/evm/evm.c                  | 2 +-
  drivers/i2c/Makefile                | 1 -
  include/configs/am3517_crane.h      | 2 +-
  include/configs/am3517_evm.h        | 2 +-
  include/configs/cm_t35.h            | 2 +-
  include/configs/cm_t3517.h          | 2 +-
  include/configs/cm_t54.h            | 2 +-
  include/configs/devkit8000.h        | 2 +-
  include/configs/mcx.h               | 2 +-
  include/configs/nokia_rx51.h        | 2 +-
  include/configs/omap3_evm.h         | 2 +-
  include/configs/omap3_logic.h       | 2 +-
  include/configs/omap3_overo.h       | 2 +-

Quoted 8 lines

  include/configs/omap3_pandora.h     | 2 +-
  include/configs/omap3_zoom1.h       | 2 +-
  include/configs/sniper.h            | 2 +-
  include/configs/tam3517-common.h    | 2 +-
  include/configs/tao3530.h           | 2 +-
  include/configs/tricorder.h         | 2 +-
  scripts/config_whitelist.txt        | 1 -
  24 files changed, 22 insertions(+), 24 deletions(-)

Thanks!

Reviewed-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Heiko Schocher

2017-08-10 10:06 UTC #2 lore raw

PATCH 1/2 Configs: Migrate CONFIG_SYS_I2C_OMAP34XX to CONFIG_SYS_I2C_OMAP24XX

In reply to Adam Ford

Hello Adam,

Am 07.08.2017 um 20:11 schrieb Adam Ford:

Quoted 23 lines

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 <[email protected]>

---
  arch/arm/mach-omap2/omap3/clock.c   | 2 +-
  board/compulab/cm_t35/cm_t35.c      | 2 +-
  board/logicpd/am3517evm/am3517evm.c | 2 +-
  board/ti/am3517crane/am3517crane.c  | 2 +-
  board/ti/evm/evm.c                  | 2 +-
  drivers/i2c/Makefile                | 1 -
  include/configs/am3517_crane.h      | 2 +-
  include/configs/am3517_evm.h        | 2 +-
  include/configs/cm_t35.h            | 2 +-
  include/configs/cm_t3517.h          | 2 +-
  include/configs/cm_t54.h            | 2 +-
  include/configs/devkit8000.h        | 2 +-
  include/configs/mcx.h               | 2 +-
  include/configs/nokia_rx51.h        | 2 +-
  include/configs/omap3_evm.h         | 2 +-
  include/configs/omap3_logic.h       | 2 +-
  include/configs/omap3_overo.h       | 2 +-

Quoted 8 lines

  include/configs/omap3_pandora.h     | 2 +-
  include/configs/omap3_zoom1.h       | 2 +-
  include/configs/sniper.h            | 2 +-
  include/configs/tam3517-common.h    | 2 +-
  include/configs/tao3530.h           | 2 +-
  include/configs/tricorder.h         | 2 +-
  scripts/config_whitelist.txt        | 1 -
  24 files changed, 22 insertions(+), 24 deletions(-)

applied to u-boot-i2c.git

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany