[U-Boot] [PATCH v2 12/17] SPEAr : i2c driver moved completely into drivers/i2c

[Tom Rix <tom@bumblecow.com>]

Vipin KUMAR wrote:
> The i2c IP used by spear platform is a synopsys i2c controller

'IP' expand.

What is the connection between 'synopsys' and 'designware' ?
If the part is synopsys, that should be the string used
instead of 'dw' or 'designware'


> The earlier driver adds the driver of this controller as if it is specific to
> spear platform.
> The driver files are now moved into drivers/i2c folder for reusability by other

Maybe something like
'The earlier i2c driver was specific to spear platforms.
  This driver has been moved to the common driver directory drivers/i2c
  where it can be used by other platforms'


Tom

> platforms
> 
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
> ---
>  drivers/i2c/Makefile                               |    2 +-
>  drivers/i2c/{spr_i2c.c => designware_i2c.c}        |    4 ++--
>  .../spr_i2c.h => drivers/i2c/designware_i2c.h      |    6 +++---
>  include/configs/spear-common.h                     |    2 +-
>  4 files changed, 7 insertions(+), 7 deletions(-)
>  rename drivers/i2c/{spr_i2c.c => designware_i2c.c} (98%)
>  rename arch/arm/include/asm/arch-spear/spr_i2c.h => drivers/i2c/designware_i2c.h (98%)
> 
> diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> index d2c2515..099a6cd 100644
> --- a/drivers/i2c/Makefile
> +++ b/drivers/i2c/Makefile
> @@ -27,6 +27,7 @@ LIB	:= $(obj)libi2c.a
>  
>  COBJS-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o
>  COBJS-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o
> +COBJS-$(CONFIG_DW_I2C) += designware_i2c.o
>  COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o
>  COBJS-$(CONFIG_I2C_KIRKWOOD) += kirkwood_i2c.o
>  COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
> @@ -38,7 +39,6 @@ COBJS-$(CONFIG_PPC4XX_I2C) += ppc4xx_i2c.o
>  COBJS-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o
>  COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o
>  COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o
> -COBJS-$(CONFIG_SPEAR_I2C) += spr_i2c.o
>  COBJS-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
>  
>  COBJS	:= $(COBJS-y)
> diff --git a/drivers/i2c/spr_i2c.c b/drivers/i2c/designware_i2c.c
> similarity index 98%
> rename from drivers/i2c/spr_i2c.c
> rename to drivers/i2c/designware_i2c.c
> index eabfe84..d352146 100644
> --- a/drivers/i2c/spr_i2c.c
> +++ b/drivers/i2c/designware_i2c.c
> @@ -24,7 +24,7 @@
>  #include <common.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
> -#include <asm/arch/spr_i2c.h>
> +#include "designware_i2c.h"
>  
>  static struct i2c_regs *const i2c_regs_p =
>      (struct i2c_regs *)CONFIG_SYS_I2C_BASE;
> @@ -113,7 +113,7 @@ int i2c_get_bus_speed(void)
>  /*
>   * i2c_init - Init function
>   * @speed:	required i2c speed
> - * @slaveadd:	slave address for the spear device
> + * @slaveadd:	slave address for the device
>   *
>   * Initialization function.
>   */
> diff --git a/arch/arm/include/asm/arch-spear/spr_i2c.h b/drivers/i2c/designware_i2c.h
> similarity index 98%
> rename from arch/arm/include/asm/arch-spear/spr_i2c.h
> rename to drivers/i2c/designware_i2c.h
> index 7521ebc..03b520e 100644
> --- a/arch/arm/include/asm/arch-spear/spr_i2c.h
> +++ b/drivers/i2c/designware_i2c.h
> @@ -21,8 +21,8 @@
>   * MA 02111-1307 USA
>   */
>  
> -#ifndef __SPR_I2C_H_
> -#define __SPR_I2C_H_
> +#ifndef __DW_I2C_H_
> +#define __DW_I2C_H_
>  
>  struct i2c_regs {
>  	u32 ic_con;
> @@ -143,4 +143,4 @@ struct i2c_regs {
>  #define I2C_FAST_SPEED		400000
>  #define I2C_STANDARD_SPEED	100000
>  
> -#endif /* __SPR_I2C_H_ */
> +#endif /* __DW_I2C_H_ */
> diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
> index 3eaa086..e49f267 100644
> --- a/include/configs/spear-common.h
> +++ b/include/configs/spear-common.h
> @@ -44,7 +44,7 @@
>  
>  /* I2C driver configuration */
>  #define CONFIG_HARD_I2C
> -#define CONFIG_SPEAR_I2C
> +#define CONFIG_DW_I2C
>  #define CONFIG_SYS_I2C_SPEED			400000
>  #define CONFIG_SYS_I2C_SLAVE			0x02
>