diff mbox

[U-Boot,v2,07/12] i2c: omap: Modify code to work without CONFIG_I2C_HARD

Message ID 20170512002401.13115-8-sjg@chromium.org
State Accepted
Commit 64a144dcea038df2b58dd3120a880e89164af09f
Delegated to: Heiko Schocher
Headers show

Commit Message

Simon Glass May 12, 2017, 12:23 a.m. UTC
Drop use of this long-deprecated option.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Lokesh Vutla <lokeshvutla@ti.com>
---

Changes in v2:
- Add new patch to adjust omap boards to not need CONFIG_I2C_HARD

 board/ti/am335x/board.c | 3 ++-
 board/ti/am43xx/board.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Tom Rini May 12, 2017, 12:30 a.m. UTC | #1
On Thu, May 11, 2017 at 06:23:56PM -0600, Simon Glass wrote:

> Drop use of this long-deprecated option.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Suggested-by: Lokesh Vutla <lokeshvutla@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
diff mbox

Patch

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 3e842d3187..7ebbac6d73 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -70,7 +70,8 @@  void do_board_detect(void)
 	enable_i2c0_pin_mux();
 	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 
-	if (ti_i2c_eeprom_am_get(-1, CONFIG_SYS_I2C_EEPROM_ADDR))
+	if (ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
+				 CONFIG_EEPROM_CHIP_ADDRESS))
 		printf("ti_i2c_eeprom_init failed\n");
 }
 #endif
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 2572029a25..1097ef67ed 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -42,7 +42,8 @@  static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
 #ifdef CONFIG_TI_I2C_BOARD_DETECT
 void do_board_detect(void)
 {
-	if (ti_i2c_eeprom_am_get(-1, CONFIG_SYS_I2C_EEPROM_ADDR))
+	if (ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
+				 CONFIG_EEPROM_CHIP_ADDRESS))
 		printf("ti_i2c_eeprom_init failed\n");
 }
 #endif