ARM: SAMSUNG: Move mach/ts.h to plat/ts.h

PATCH New Maurus Cuelenaere 1 participant 1 message May 4, 2010

Subsystems (4)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos Input drivers

lore

Share & tools

lore

Maurus Cuelenaere

author

2010-05-04 11:12 UTC #0 lore raw

PATCH 1/2 ARM: SAMSUNG: Move mach/ts.h to plat/ts.h

This moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in order to prepare for s3c64xx support in the touchscreen driver.

Signed-off-by Maurus Cuelenaere <[email protected]>

---
 arch/arm/mach-s3c2410/mach-h1940.c                 |    2 +-
 arch/arm/plat-s3c24xx/devs.c                       |    3 +--
 .../mach => plat-samsung/include/plat}/ts.h        |    2 +-
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename arch/arm/{mach-s3c2410/include/mach => plat-samsung/include/plat}/ts.h (92%)

arch/arm/mach-s3c2410/mach-h1940.c +1 -1

index fbedd07..75e3ffb 100644
@@ -46,7 +46,6 @@
 #include <mach/h1940.h>
 #include <mach/h1940-latch.h>
 #include <mach/fb.h>
-#include <mach/ts.h>
 #include <plat/udc.h>
 #include <plat/iic.h>

@@ -56,6 +55,7 @@
 #include <plat/pll.h>
 #include <plat/pm.h>
 #include <plat/mci.h>
+#include <plat/ts.h>
 
 static struct map_desc h1940_iodesc[] __initdata = {
 	[0] = {

arch/arm/plat-s3c24xx/devs.c +1 -2

index 9265f09..93855a9 100644
@@ -38,8 +38,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/regs-spi.h>
-
-#include <mach/ts.h>
+#include <plat/ts.h>
 
 /* Serial port registrations */

arch/arm/plat-samsung/include/plat/ts.h renamed from arch/arm/mach-s3c2410/include/mach/ts.h +1 -1

similarity index 92%
rename from arch/arm/mach-s3c2410/include/mach/ts.h
rename to arch/arm/plat-samsung/include/plat/ts.h
index dc36170..8a51675 100644
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/ts.h
+/* arch/arm/plat-samsung/include/plat/ts.h
  *
  * Copyright (c) 2005 Arnaud Patard <[email protected]>
  *

drivers/input/touchscreen/s3c2410_ts.c +1 -1

index 98a7d12..a2e1228 100644
@@ -37,9 +37,9 @@
 
 #include <plat/adc.h>
 #include <plat/regs-adc.h>
+#include <plat/ts.h>
 
 #include <mach/regs-gpio.h>
-#include <mach/ts.h>
 
 #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))

Signature · 1 line

1.7.1