[U-Boot] [PATCH v4] i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

[Igor Grinberg]

Hi Heiko,

On 10/22/13 11:03, Heiko Schocher wrote:
> - add omap24xx driver to new multibus/multiadpater support
> - adapted all config files, which uses this driver
> 
> Tested on the am335x based siemens boards rut, dxr2 and pxm2
> posted here:
> http://patchwork.ozlabs.org/patch/263211/
> 
> Signed-off-by: Heiko Schocher <hs at denx.de>
> Tested-by: Tom Rini <trini at ti.com>
> Cc: Lars Poeschel <poeschel at lemonage.de>
> Cc: Steve Sakoman <sakoman at gmail.com>
> Cc: Thomas Weber <weber at corscience.de>
> Cc: Tom Rix <Tom.Rix at windriver.com>
> Cc: Grazvydas Ignotas <notasas at gmail.com>
> Cc: Enric Balletbo i Serra <eballetbo at iseebcn.com>
> Cc: Luca Ceresoli <luca.ceresoli at comelit.it>
> Cc: Igor Grinberg <grinberg at compulab.co.il>
> Cc: Ilya Yanok <yanok at emcraft.com>
> Cc: Stefano Babic <sbabic at denx.de>
> Cc: Nishanth Menon <nm at ti.com>
> Cc: Pali Rohár <pali.rohar at gmail.com>
> Cc: Peter Barada <peter.barada at logicpd.com>
> Cc: Nagendra T S  <nagendra at mistralsolutions.com>
> Cc: Michael Jones <michael.jones at matrix-vision.de>
> Cc: Raphael Assenat <raph at 8d.com>

[...]

>  board/compulab/cm_t35/Makefile                 |   2 +-
>  board/compulab/cm_t35/cm_t35.c                 |   2 +-
>  board/compulab/cm_t35/eeprom.h                 |   2 +-

[...]

>  include/configs/cm_t35.h                       |   8 +-

[...]

> diff --git a/board/compulab/cm_t35/Makefile b/board/compulab/cm_t35/Makefile
> index 6d07947..9014d2a 100644
> --- a/board/compulab/cm_t35/Makefile
> +++ b/board/compulab/cm_t35/Makefile
> @@ -11,7 +11,7 @@ include $(TOPDIR)/config.mk
>  
>  LIB	= $(obj)lib$(BOARD).o
>  
> -COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
> +COBJS-$(CONFIG_SYS_I2C_OMAP34XX) += eeprom.o
>  COBJS-$(CONFIG_LCD) += display.o
>  
>  COBJS	:= cm_t35.o leds.o $(COBJS-y)
> diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
> index 3caa5be..1dd3647 100644
> --- a/board/compulab/cm_t35/cm_t35.c
> +++ b/board/compulab/cm_t35/cm_t35.c
> @@ -470,7 +470,7 @@ static void setup_net_chip_gmpc(void)
>  		&ctrl_base->gpmc_nadv_ale);
>  }
>  
> -#ifdef CONFIG_DRIVER_OMAP34XX_I2C
> +#ifdef CONFIG_SYS_I2C_OMAP34XX
>  /*
>   * Routine: reset_net_chip
>   * Description: reset the Ethernet controller via TPS65930 GPIO
> diff --git a/board/compulab/cm_t35/eeprom.h b/board/compulab/cm_t35/eeprom.h
> index 02ffbb1..a07559d 100644
> --- a/board/compulab/cm_t35/eeprom.h
> +++ b/board/compulab/cm_t35/eeprom.h
> @@ -10,7 +10,7 @@
>  #ifndef _EEPROM_
>  #define _EEPROM_
>  
> -#ifdef CONFIG_DRIVER_OMAP34XX_I2C
> +#ifdef CONFIG_SYS_I2C_OMAP34XX
>  int cm_t3x_eeprom_read_mac_addr(uchar *buf);
>  u32 cm_t3x_eeprom_get_board_rev(void);
>  #else

Please, rebase on top of:
http://patchwork.ozlabs.org/patch/275284/
which should be applied any time soon.

Otherwise,
Acked-by: Igor Grinberg <grinberg at compulab.co.il>

[...]

> diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
> index bc5b66c..c301697 100644
> --- a/include/configs/cm_t35.h
> +++ b/include/configs/cm_t35.h
> @@ -140,10 +140,10 @@
>  #undef CONFIG_CMD_IMLS		/* List all found images	*/
>  
>  #define CONFIG_SYS_NO_FLASH
> -#define CONFIG_HARD_I2C
> -#define CONFIG_SYS_I2C_SPEED		100000
> -#define CONFIG_SYS_I2C_SLAVE		1
> -#define CONFIG_DRIVER_OMAP34XX_I2C
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
> +#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
> +#define CONFIG_SYS_I2C_OMAP34XX
>  #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
>  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
>  #define CONFIG_I2C_MULTI_BUS

[...]


-- 
Regards,
Igor.