[U-Boot] [PATCH 07/11] i2c: Drop use of CONFIG_I2C_HARD

Lokesh Vutla lokeshvutla at ti.com
Tue Apr 25 03:03:44 UTC 2017


Hi Simon,

On Sunday 23 April 2017 09:05 PM, Simon Glass wrote:
> Drop use of this long-deprecated option.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  README                       | 16 ++++++++--------
>  board/ti/am335x/board.c      |  6 +-----
>  board/ti/am43xx/board.c      |  3 +--

[..snip..]

> diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
> index 3e842d3187..0d2e84011d 100644
> --- a/board/ti/am335x/board.c
> +++ b/board/ti/am335x/board.c
> @@ -67,11 +67,7 @@ static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
>  #ifdef CONFIG_TI_I2C_BOARD_DETECT
>  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))

This is very early board detection code that happens in SPL. There were
common Kconfig options added for eeprom
address(CONFIG_EEPROM_BUS_ADDRESS, CONFIG_EEPROM_CHIP_ADDRESS) but
missed updating in these boards.

Instead of removing can this be updated to

-	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


> -		printf("ti_i2c_eeprom_init failed\n");
> +	printf("ti_i2c_eeprom_init failed\n");
>  }
>  #endif
>  
> diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
> index 390cc168cd..a190893450 100644
> --- a/board/ti/am43xx/board.c
> +++ b/board/ti/am43xx/board.c
> @@ -42,8 +42,7 @@ 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))
> -		printf("ti_i2c_eeprom_init failed\n");
> +	printf("ti_i2c_eeprom_init failed\n");
>  }
>  #endif

Same as above.

Thanks and regards,
Lokesh



More information about the U-Boot mailing list