[PATCH 09/15] ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100

[Kukjin Kim]

Marek Szyprowski wrote:
> 
> Move i2c helpers from plat-s5pc1xx to mach-s5pc100.

It would be nice that separate submitting this patch from c100 clean up
with your [PATCH 2/3] ARM: Samsung: move common I2C0 device helpers to
machine directories.

1. Moving common I2C0 device helpers to each mach directory
2. And then C100's I2Cx moving.

> 
> Signed-off-by: Marek Szyprowski <m.szyprowski at samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
> ---
>  arch/arm/mach-s5pc100/Kconfig                      |    8 ++++++--
>  arch/arm/mach-s5pc100/Makefile                     |    2 ++
>  .../{plat-s5pc1xx => mach-s5pc100}/setup-i2c0.c    |    4 ++--
>  .../{plat-s5pc1xx => mach-s5pc100}/setup-i2c1.c    |    4 ++--
>  arch/arm/plat-s5pc1xx/Kconfig                      |   14 --------------
>  arch/arm/plat-s5pc1xx/Makefile                     |    2 --
>  6 files changed, 12 insertions(+), 22 deletions(-)
>  rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-i2c0.c (89%)
>  rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-i2c1.c (89%)
> 
> diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
> index b24c66d..9b10541 100644
> --- a/arch/arm/mach-s5pc100/Kconfig
> +++ b/arch/arm/mach-s5pc100/Kconfig
> @@ -23,6 +23,11 @@ config S5PC100_SETUP_SDHCI
>          help
>            Internal helper functions for S5PC100 based SDHCI systems
> 
> +config S5PC100_SETUP_I2C1
> +	bool
> +	help
> +	  Common setup code for i2c bus 1.
> +
>  config MACH_SMDKC100
>  	bool "SMDKC100"
>  	select CPU_S5PC100
> @@ -31,9 +36,8 @@ config MACH_SMDKC100
>  	select S3C_DEV_HSMMC
>  	select S3C_DEV_HSMMC1
>  	select S3C_DEV_HSMMC2
> -	select S5PC1XX_SETUP_I2C0
> -	select S5PC1XX_SETUP_I2C1
>  	select S5PC100_SETUP_FB_24BPP
> +	select S5PC100_SETUP_I2C1
>  	select S5PC100_SETUP_SDHCI
>  	help
>  	  Machine support for the Samsung SMDKC100
> diff --git a/arch/arm/mach-s5pc100/Makefile
b/arch/arm/mach-s5pc100/Makefile
> index ccf0dca..741fba0 100644
> --- a/arch/arm/mach-s5pc100/Makefile
> +++ b/arch/arm/mach-s5pc100/Makefile
> @@ -12,10 +12,12 @@ obj-				:=
>  # Core support for S5PC100 system
> 
>  obj-$(CONFIG_CPU_S5PC100)	+= cpu.o gpio.o
> +obj-$(CONFIG_CPU_S5PC100)	+= setup-i2c0.o
> 
>  # Helper and device support
> 
>  obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
> +obj-$(CONFIG_S5PC100_SETUP_I2C1)	+= setup-i2c1.o
>  obj-$(CONFIG_S5PC100_SETUP_SDHCI)       += setup-sdhci.o
> 
>  # machine support
> diff --git a/arch/arm/plat-s5pc1xx/setup-i2c0.c
b/arch/arm/mach-s5pc100/setup-
> i2c0.c
> similarity index 89%
> rename from arch/arm/plat-s5pc1xx/setup-i2c0.c
> rename to arch/arm/mach-s5pc100/setup-i2c0.c
> index 5e4a7c3..dd3174e 100644
> --- a/arch/arm/plat-s5pc1xx/setup-i2c0.c
> +++ b/arch/arm/mach-s5pc100/setup-i2c0.c
> @@ -1,9 +1,9 @@
> -/* linux/arch/arm/plat-s5pc1xx/setup-i2c0.c
> +/* linux/arch/arm/mach-s5pc100/setup-i2c0.c
>   *
>   * Copyright 2009 Samsung Electronics Co.
>   *	Byungho Min <bhmin at samsung.com>
>   *
> - * Base S5PC1XX I2C bus 0 gpio configuration
> + * Base S5PC100 I2C bus 0 gpio configuration
>   *
>   * Based on plat-s3c64xx/setup-i2c0.c
>   *
> diff --git a/arch/arm/plat-s5pc1xx/setup-i2c1.c
b/arch/arm/mach-s5pc100/setup-
> i2c1.c
> similarity index 89%
> rename from arch/arm/plat-s5pc1xx/setup-i2c1.c
> rename to arch/arm/mach-s5pc100/setup-i2c1.c
> index a0a8b4a..d1fec26 100644
> --- a/arch/arm/plat-s5pc1xx/setup-i2c1.c
> +++ b/arch/arm/mach-s5pc100/setup-i2c1.c
> @@ -1,9 +1,9 @@
> -/* linux/arch/arm/plat-s3c64xx/setup-i2c1.c
> +/* linux/arch/arm/mach-s5pc100/setup-i2c1.c
>   *
>   * Copyright 2009 Samsung Electronics Co.
>   *	Byungho Min <bhmin at samsung.com>
>   *
> - * Base S5PC1XX I2C bus 1 gpio configuration
> + * Base S5PC100 I2C bus 1 gpio configuration
>   *
>   * Based on plat-s3c64xx/setup-i2c1.c
>   *
> diff --git a/arch/arm/plat-s5pc1xx/Kconfig b/arch/arm/plat-s5pc1xx/Kconfig
> index 708f7a0..c7bd2bb 100644
> --- a/arch/arm/plat-s5pc1xx/Kconfig
> +++ b/arch/arm/plat-s5pc1xx/Kconfig
> @@ -39,20 +39,6 @@ config CPU_S5PC100_CLOCK
> 
>  # platform specific device setup
> 
> -config S5PC1XX_SETUP_I2C0
> -	bool
> -	default y
> -	help
> -	  Common setup code for i2c bus 0.
> -
> -	  Note, currently since i2c0 is always compiled, this setup helper
> -	  is always compiled with it.
> -
> -config S5PC1XX_SETUP_I2C1
> -	bool
> -	help
> -	  Common setup code for i2c bus 1.
> -
>  config S5PC1XX_SETUP_SDHCI_GPIO
>  	bool
>  	help
> diff --git a/arch/arm/plat-s5pc1xx/Makefile
b/arch/arm/plat-s5pc1xx/Makefile
> index a5b90c0..9ce6409 100644
> --- a/arch/arm/plat-s5pc1xx/Makefile
> +++ b/arch/arm/plat-s5pc1xx/Makefile
> @@ -23,6 +23,4 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK)	+= s5pc100-clock.o
> 
>  # Device setup
> 
> -obj-$(CONFIG_S5PC1XX_SETUP_I2C0) += setup-i2c0.o
> -obj-$(CONFIG_S5PC1XX_SETUP_I2C1) += setup-i2c1.o
>  obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
> --
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim at samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.