Browse Source

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>
Ben Dooks 15 years ago
parent
commit
2b6c02abca
3 changed files with 5 additions and 5 deletions
  1. 2 3
      arch/arm/plat-samsung/Kconfig
  2. 1 0
      arch/arm/plat-samsung/Makefile
  3. 2 2
      arch/arm/plat-samsung/dev-ts.c

+ 2 - 3
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
 

+ 1 - 0
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
 

+ 2 - 2
arch/arm/mach-s3c64xx/dev-ts.c → 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] = {