Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51ffd971 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Ben Dooks
Browse files

ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 



Move i2c helpers from plat-s5pc1xx to mach-s5pc100.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent b884c0e0

arch/arm/mach-s5pc100/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-s5pc100/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -12,10 +12,12 @@ obj- := 
# Core support for S5PC100 system



obj-$(CONFIG_CPU_S5PC100)	+= cpu.o gpiolib.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

arch/arm/plat-s5pc1xx/setup-i2c0.c→arch/arm/mach-s5pc100/setup-i2c0.c

+2 −2
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s5pc1xx/setup-i2c0.c

/* linux/arch/arm/mach-s5pc100/setup-i2c0.c

 *

 * Copyright 2009 Samsung Electronics Co.

 *	Byungho Min <bhmin@samsung.com>

 *

 * Base S5PC1XX I2C bus 0 gpio configuration

 * Base S5PC100 I2C bus 0 gpio configuration

 *

 * Based on plat-s3c64xx/setup-i2c0.c

 *

arch/arm/plat-s5pc1xx/setup-i2c1.c→arch/arm/mach-s5pc100/setup-i2c1.c

+2 −2
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c64xx/setup-i2c1.c

/* linux/arch/arm/mach-s5pc100/setup-i2c1.c

 *

 * Copyright 2009 Samsung Electronics Co.

 *	Byungho Min <bhmin@samsung.com>

 *

 * Base S5PC1XX I2C bus 1 gpio configuration

 * Base S5PC100 I2C bus 1 gpio configuration

 *

 * Based on plat-s3c64xx/setup-i2c1.c

 *

arch/arm/plat-s5pc1xx/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -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