From 2b6c02abca5a04bf8d9f8a3b1976a5b10d317603 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 19 May 2010 14:36:28 +0900
Subject: [PATCH] ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and
rename configuration
Move the arch/arm/mach-s3c64xx/dev-ts.c file to arch/arm/plat-samsung and
rename the Kconfig entry appropriately.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/plat-samsung/Kconfig | 5 ++---
arch/arm/plat-samsung/Makefile | 1 +
arch/arm/{mach-s3c64xx => plat-samsung}/dev-ts.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
rename arch/arm/{mach-s3c64xx => plat-samsung}/dev-ts.c (95%)
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 896b171bd4302..229919e9744c8 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -206,11 +206,10 @@ config S3C64XX_DEV_SPI
Compile in platform device definitions for S3C64XX's type
SPI controllers.
-config S3C64XX_DEV_TS
+config SAMSUNG_DEV_TS
bool
help
- Common in platform device definitions for S3C64XX touchscreen
- device
+ Common in platform device definitions for touchscreen device
# DMA
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 7068af322e73c..48288499a3b9f 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o
obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o
+obj-$(CONFIG_SAMSUNG_DEV_TS) += dev-ts.o
# DMA support
diff --git a/arch/arm/mach-s3c64xx/dev-ts.c b/arch/arm/plat-samsung/dev-ts.c
similarity index 95%
rename from arch/arm/mach-s3c64xx/dev-ts.c
rename to arch/arm/plat-samsung/dev-ts.c
index 17cc7934afbe2..236ef8427d7df 100644
--- a/arch/arm/mach-s3c64xx/dev-ts.c
+++ b/arch/arm/plat-samsung/dev-ts.c
@@ -25,8 +25,8 @@
static struct resource s3c_ts_resource[] = {
[0] = {
- .start = S3C64XX_PA_ADC,
- .end = S3C64XX_PA_ADC + SZ_256 - 1,
+ .start = SAMSUNG_PA_ADC,
+ .end = SAMSUNG_PA_ADC + SZ_256 - 1,
.flags = IORESOURCE_MEM,
},
[1] = {