ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration
Ben Dooks [Wed, 19 May 2010 05:36:28 +0000 (14:36 +0900)]
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
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/dev-ts.c [moved from arch/arm/mach-s3c64xx/dev-ts.c with 95% similarity]

index 896b171..229919e 100644 (file)
@@ -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
 
index 7068af3..4828849 100644 (file)
@@ -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
 
similarity index 95%
rename from arch/arm/mach-s3c64xx/dev-ts.c
rename to arch/arm/plat-samsung/dev-ts.c
index 17cc793..236ef84 100644 (file)
@@ -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] = {