From: Simon Glass Date: Sat, 13 May 2017 03:09:55 +0000 (-0600) Subject: i2c: omap: Modify code to work without CONFIG_I2C_HARD X-Git-Tag: v2017.07-rc1~258^2~5 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=64a144dcea038df2b58dd3120a880e89164af09f;p=oweals%2Fu-boot.git i2c: omap: Modify code to work without CONFIG_I2C_HARD Drop use of this long-deprecated option. Signed-off-by: Simon Glass Suggested-by: Lokesh Vutla Reviewed-by: Tom Rini --- diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 3e81521399..517965c0f0 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -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 diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index f633e2f85d..f44103d4d6 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