]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
i2c: omap: Modify code to work without CONFIG_I2C_HARD
authorSimon Glass <sjg@chromium.org>
Sat, 13 May 2017 03:09:55 +0000 (21:09 -0600)
committerHeiko Schocher <hs@denx.de>
Mon, 15 May 2017 04:18:20 +0000 (06:18 +0200)
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>
board/ti/am335x/board.c
board/ti/am43xx/board.c

index 3e815213998fe36a97ff2e758c728e44dba933e5..517965c0f03cf522846fe7c823a1ca41f8f2aee9 100644 (file)
@@ -72,7 +72,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
index f633e2f85dffc00696eb59b908b215d4347351ce..f44103d4d6fe250083aa833bb6d5e17449fb7022 100644 (file)
@@ -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