Skip to contentSkip to conversation

Convert CONFIG_SYS_I2C_OMAP24XX to Kconfig

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
#0 lore raw

PATCH 2/2 Convert CONFIG_SYS_I2C_OMAP24XX to Kconfig

This converts the following to Kconfig:
CONFIG_SYS_I2C_OMAP24XX

Signed-off-by Adam Ford <[email protected]>
---
 arch/arm/mach-omap2/Kconfig            | 5 +++++
 configs/ti816x_evm_defconfig           | 1 +
 drivers/i2c/Kconfig                    | 6 ++++++
 include/configs/am3517_crane.h         | 1 -
 include/configs/am3517_evm.h           | 1 -
 include/configs/bur_am335x_common.h    | 1 -
 include/configs/cm_t35.h               | 1 -
 include/configs/cm_t3517.h             | 1 -
 include/configs/cm_t54.h               | 1 -
 include/configs/devkit8000.h           | 2 --
 include/configs/kc1.h                  | 1 -
 include/configs/mcx.h                  | 1 -
 include/configs/nokia_rx51.h           | 1 -
 include/configs/omap3_evm.h            | 1 -
 include/configs/omap3_logic.h          | 1 -
 include/configs/omap3_overo.h          | 1 -
 include/configs/omap3_pandora.h        | 3 ---
 include/configs/omap3_zoom1.h          | 3 ---
 include/configs/siemens-am33x-common.h | 1 -
 include/configs/sniper.h               | 1 -
 include/configs/tam3517-common.h       | 1 -
 include/configs/tao3530.h              | 1 -
 include/configs/ti_armv7_omap.h        | 1 -
 include/configs/ti_omap4_common.h      | 1 -
 include/configs/tricorder.h            | 1 -
 scripts/config_whitelist.txt           | 1 -
 26 files changed, 12 insertions(+), 28 deletions(-)
arch/arm/mach-omap2/Kconfig +5 -0
index 013586e..89c91d1 100644
@@ -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
configs/ti816x_evm_defconfig +1 -0
index 0f9b905..9d4be2a 100644
@@ -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
drivers/i2c/Kconfig +6 -0
index 8ac1cc6..720e82d 100644
@@ -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
include/configs/am3517_crane.h +0 -1
index eb1fa5f..aeba61e 100644
@@ -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.
include/configs/am3517_evm.h +0 -1
index 42e4053..60460c8 100644
@@ -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
include/configs/bur_am335x_common.h +0 -1
index 8d0e0ea..c199d64 100644
@@ -73,7 +73,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
include/configs/cm_t35.h +0 -1
index 1fae294..f8f3c92 100644
@@ -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
include/configs/cm_t3517.h +0 -1
index 2d289ac..5821183 100644
@@ -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
include/configs/cm_t54.h +0 -1
index f6dab1e..feae29d 100644
@@ -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
include/configs/devkit8000.h +0 -2
index d3a32ca..5b249d1 100644
@@ -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
include/configs/kc1.h +0 -1
index f040d0b..38c5862 100644
@@ -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
 
 /*
include/configs/mcx.h +0 -1
index 8fd3b31..f255334 100644
@@ -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
include/configs/nokia_rx51.h +0 -1
index 481ec95..a06aec1 100644
@@ -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
include/configs/omap3_evm.h +0 -1
index de5af4b..bc859c8 100644
@@ -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
include/configs/omap3_logic.h +0 -1
index d4c1855..e5ffb85 100644
@@ -53,7 +53,6 @@
 #define CONFIG_USB_OMAP3
 
 /* I2C */
-#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM AT24C64      */
 
 /* USB */
include/configs/omap3_overo.h +0 -1
index f9d450b..bc4a59e 100644
@@ -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
include/configs/omap3_pandora.h +0 -3
index e6d2a4f..53c53ef 100644
@@ -29,9 +29,6 @@
  * Hardware drivers
  */
 
-/* I2C Support */
-#define CONFIG_SYS_I2C_OMAP24XX
-
 /* TWL4030 LED */
 #define CONFIG_TWL4030_LED
include/configs/omap3_zoom1.h +0 -3
index 04b1def..7f4f56f 100644
@@ -63,9 +63,6 @@
 #endif
 #endif
 
-#undef CONFIG_SYS_I2C_OMAP24XX
-#define CONFIG_SYS_I2C_OMAP24XX
-
 /*
  * TWL4030
  */
include/configs/siemens-am33x-common.h +0 -1
index 5a5bf7a..0723198 100644
@@ -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
include/configs/sniper.h +0 -1
index a4497ac..34f6d8a 100644
@@ -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
 
 /*
include/configs/tam3517-common.h +0 -1
index acc0bac..37f8767 100644
@@ -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
include/configs/tao3530.h +0 -1
index 49ea967..1f36ac6 100644
@@ -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
include/configs/ti_armv7_omap.h +0 -1
index 85f1d96..6834500 100644
@@ -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
include/configs/ti_omap4_common.h +0 -1
index 1a6551e..acfac24 100644
@@ -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 */
include/configs/tricorder.h +0 -1
index 02fa5c8..fbdd43a 100644
@@ -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 */
scripts/config_whitelist.txt +0 -1
index 6c7c132..34f479b 100644
@@ -3533,7 +3533,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
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 Convert CONFIG_SYS_I2C_OMAP24XX to Kconfig

Hello Adam,

Am 07.08.2017 um 20:11 schrieb Adam Ford:

Quoted 24 lines

This converts the following to Kconfig:

    CONFIG_SYS_I2C_OMAP24XX
Signed-off-by Adam Ford <[email protected]>
---
  arch/arm/mach-omap2/Kconfig            | 5 +++++
  configs/ti816x_evm_defconfig           | 1 +
  drivers/i2c/Kconfig                    | 6 ++++++
  include/configs/am3517_crane.h         | 1 -
  include/configs/am3517_evm.h           | 1 -
  include/configs/bur_am335x_common.h    | 1 -
  include/configs/cm_t35.h               | 1 -
  include/configs/cm_t3517.h             | 1 -
  include/configs/cm_t54.h               | 1 -
  include/configs/devkit8000.h           | 2 --
  include/configs/kc1.h                  | 1 -
  include/configs/mcx.h                  | 1 -
  include/configs/nokia_rx51.h           | 1 -
  include/configs/omap3_evm.h            | 1 -
  include/configs/omap3_logic.h          | 1 -
  include/configs/omap3_overo.h          | 1 -
  include/configs/omap3_pandora.h        | 3 ---
  include/configs/omap3_zoom1.h          | 3 ---
  include/configs/siemens-am33x-common.h | 1 -
Quoted 8 lines
  include/configs/sniper.h               | 1 -
  include/configs/tam3517-common.h       | 1 -
  include/configs/tao3530.h              | 1 -
  include/configs/ti_armv7_omap.h        | 1 -
  include/configs/ti_omap4_common.h      | 1 -
  include/configs/tricorder.h            | 1 -
  scripts/config_whitelist.txt           | 1 -
  26 files changed, 12 insertions(+), 28 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
#2 lore raw

PATCH 2/2 Convert CONFIG_SYS_I2C_OMAP24XX to Kconfig

In reply to Adam Ford

Hello Adam,

Am 07.08.2017 um 20:11 schrieb Adam Ford:

Quoted 24 lines

This converts the following to Kconfig:

    CONFIG_SYS_I2C_OMAP24XX
Signed-off-by Adam Ford <[email protected]>
---
  arch/arm/mach-omap2/Kconfig            | 5 +++++
  configs/ti816x_evm_defconfig           | 1 +
  drivers/i2c/Kconfig                    | 6 ++++++
  include/configs/am3517_crane.h         | 1 -
  include/configs/am3517_evm.h           | 1 -
  include/configs/bur_am335x_common.h    | 1 -
  include/configs/cm_t35.h               | 1 -
  include/configs/cm_t3517.h             | 1 -
  include/configs/cm_t54.h               | 1 -
  include/configs/devkit8000.h           | 2 --
  include/configs/kc1.h                  | 1 -
  include/configs/mcx.h                  | 1 -
  include/configs/nokia_rx51.h           | 1 -
  include/configs/omap3_evm.h            | 1 -
  include/configs/omap3_logic.h          | 1 -
  include/configs/omap3_overo.h          | 1 -
  include/configs/omap3_pandora.h        | 3 ---
  include/configs/omap3_zoom1.h          | 3 ---
  include/configs/siemens-am33x-common.h | 1 -
Quoted 8 lines
  include/configs/sniper.h               | 1 -
  include/configs/tam3517-common.h       | 1 -
  include/configs/tao3530.h              | 1 -
  include/configs/ti_armv7_omap.h        | 1 -
  include/configs/ti_omap4_common.h      | 1 -
  include/configs/tricorder.h            | 1 -
  scripts/config_whitelist.txt           | 1 -
  26 files changed, 12 insertions(+), 28 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