From a64a91eef4e16eb3104553c0980cf4b14815f6c8 Mon Sep 17 00:00:00 2001
From: Heiko Stuebner <heiko@sntech.de>
Date: Wed, 7 Mar 2012 01:47:15 -0800
Subject: [PATCH] --- yaml --- r: 295695 b: refs/heads/master c:
 2c5689a7c96ea4c04f0454cd29eaf957a3080877 h: refs/heads/master i:   295693:
 23f8ff06069e0d56c07ab19432e742f513005754   295691:
 fc14fcb78b41b5f13af4d9ff910866f53bc11e6a   295687:
 cb336ab11a2e76eeeee3a51445ece91d1b98653a   295679:
 81aa1775b53af68c6cade1442bd8a791c624d3d2 v: v3

---
 [refs]                                                    | 2 +-
 trunk/arch/arm/mach-s3c24xx/Kconfig                       | 7 ++++++-
 trunk/arch/arm/mach-s3c24xx/Makefile                      | 2 ++
 trunk/arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-i2c.c | 0
 trunk/arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-ts.c  | 0
 trunk/arch/arm/plat-s3c24xx/Kconfig                       | 5 -----
 trunk/arch/arm/plat-s3c24xx/Makefile                      | 4 ----
 7 files changed, 9 insertions(+), 11 deletions(-)
 rename trunk/arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-i2c.c (100%)
 rename trunk/arch/arm/{plat-s3c24xx => mach-s3c24xx}/setup-ts.c (100%)

diff --git a/[refs] b/[refs]
index d535d28880ba..40f4f8219c29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec2cc753f47bfb4ce3584eb8cd9119340617bf12
+refs/heads/master: 2c5689a7c96ea4c04f0454cd29eaf957a3080877
diff --git a/trunk/arch/arm/mach-s3c24xx/Kconfig b/trunk/arch/arm/mach-s3c24xx/Kconfig
index df6f419f9a5d..b399021ed6eb 100644
--- a/trunk/arch/arm/mach-s3c24xx/Kconfig
+++ b/trunk/arch/arm/mach-s3c24xx/Kconfig
@@ -106,6 +106,11 @@ config S3C24XX_SIMTEC_USB
 	help
 	  USB management code for common Simtec S3C24XX boards
 
+config S3C24XX_SETUP_TS
+	bool
+	help
+	  Compile in platform device definition for Samsung TouchScreen.
+
 # cpu-specific sections
 
 if CPU_S3C2410
@@ -178,7 +183,7 @@ config ARCH_H1940
 	select PM_H1940 if PM
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_NAND
-	select S3C2410_SETUP_TS
+	select S3C24XX_SETUP_TS
 	help
 	  Say Y here if you are using the HP IPAQ H1940
 
diff --git a/trunk/arch/arm/mach-s3c24xx/Makefile b/trunk/arch/arm/mach-s3c24xx/Makefile
index 2843c81aa4f7..3f39e6fc4b23 100644
--- a/trunk/arch/arm/mach-s3c24xx/Makefile
+++ b/trunk/arch/arm/mach-s3c24xx/Makefile
@@ -91,3 +91,5 @@ obj-$(CONFIG_MACH_OSIRIS_DVS)		+= mach-osiris-dvs.o
 # device setup
 
 obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
+obj-$(CONFIG_ARCH_S3C24XX)		+= setup-i2c.o
+obj-$(CONFIG_S3C24XX_SETUP_TS)		+= setup-ts.o
diff --git a/trunk/arch/arm/plat-s3c24xx/setup-i2c.c b/trunk/arch/arm/mach-s3c24xx/setup-i2c.c
similarity index 100%
rename from trunk/arch/arm/plat-s3c24xx/setup-i2c.c
rename to trunk/arch/arm/mach-s3c24xx/setup-i2c.c
diff --git a/trunk/arch/arm/plat-s3c24xx/setup-ts.c b/trunk/arch/arm/mach-s3c24xx/setup-ts.c
similarity index 100%
rename from trunk/arch/arm/plat-s3c24xx/setup-ts.c
rename to trunk/arch/arm/mach-s3c24xx/setup-ts.c
diff --git a/trunk/arch/arm/plat-s3c24xx/Kconfig b/trunk/arch/arm/plat-s3c24xx/Kconfig
index 0338d207475d..21bf6adb9198 100644
--- a/trunk/arch/arm/plat-s3c24xx/Kconfig
+++ b/trunk/arch/arm/plat-s3c24xx/Kconfig
@@ -113,9 +113,4 @@ config S3C2412_IOTIMING
 	  Intel node to select io timing code that is common to the s3c2412
 	  and the s3c2443.
 
-config S3C2410_SETUP_TS
-	bool
-	help
-	  Compile in platform device definition for Samsung TouchScreen.
-
 endif
diff --git a/trunk/arch/arm/plat-s3c24xx/Makefile b/trunk/arch/arm/plat-s3c24xx/Makefile
index 27dd9c5fc147..2467b800cc76 100644
--- a/trunk/arch/arm/plat-s3c24xx/Makefile
+++ b/trunk/arch/arm/plat-s3c24xx/Makefile
@@ -31,7 +31,3 @@ obj-$(CONFIG_S3C24XX_DMA)	+= dma.o
 obj-$(CONFIG_S3C2410_IOTIMING)	+= s3c2410-iotiming.o
 obj-$(CONFIG_S3C2412_IOTIMING)	+= s3c2412-iotiming.o
 obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o
-
-# device specific setup and/or initialisation
-obj-$(CONFIG_ARCH_S3C24XX)	+= setup-i2c.o
-obj-$(CONFIG_S3C2410_SETUP_TS)	+= setup-ts.o