ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
Subsystems (4)
PATCH 1/4 ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
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.
--- arch/arm/mach-s3c2410/include/mach/ts.h | 21 --------------------- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 3 +-- arch/arm/plat-samsung/include/plat/ts.h | 21 +++++++++++++++++++++ drivers/input/touchscreen/s3c2410_ts.c | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 arch/arm/mach-s3c2410/include/mach/ts.h create mode 100644 arch/arm/plat-samsung/include/plat/ts.h
(quoted diff) +0 -0
b/arch/arm/mach-s3c2410/include/mach/ts.h
deleted file mode 100644
index dc36170..0000000
arch/arm/mach-s3c2410/include/mach/ts.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* linux/include/asm/arch-s3c2410/ts.h -* -* Copyright (c) 2005 Arnaud Patard <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARM_TS_H -#define __ASM_ARM_TS_H - -struct s3c2410_ts_mach_info { -int delay; -int presc; -int oversampling_shift; -}; - -extern void s3c24xx_ts_set_platdata (struct s3c2410_ts_mach_info *); - -#endif /* __ASM_ARM_TS_H */
(quoted diff) +0 -0
b/arch/arm/mach-s3c2410/mach-h1940.c
index fbedd07..75e3ffb 100644
arch/arm/mach-s3c2410/mach-h1940.c +1 -1
@@ -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
@@ -37,8 +37,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 */
(quoted diff) +0 -0
b/arch/arm/plat-samsung/include/plat/ts.h
new file mode 100644
index 0000000..8a51675
arch/arm/plat-samsung/include/plat/ts.h new file +21 -0
@@ -0,0 +1,21 @@ +/* arch/arm/plat-samsung/include/plat/ts.h +* +* Copyright (c) 2005 Arnaud Patard <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARM_TS_H +#define __ASM_ARM_TS_H + +struct s3c2410_ts_mach_info { +int delay; +int presc; +int oversampling_shift; +}; + +extern void s3c24xx_ts_set_platdata (struct s3c2410_ts_mach_info *); + +#endif /* __ASM_ARM_TS_H */
(quoted diff) +0 -0
b/drivers/input/touchscreen/s3c2410_ts.c
index 6386b44..0cd0ca6 100644
drivers/input/touchscreen/s3c2410_ts.c +1 -1
@@ -38,9 +38,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.6.6.1
PATCH 1/4 ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
Quoted 6 lines · Maurus Cuelenaere
ARM: SAMSUNG: Move
mach/ts.htoplat/ts.hThis moves
mach-s3c2410/include/mach/ts.htoplat-samsung/include/plat/ts.hin order to prepare for s3c64xx support in the touchscreen driver.Signed-off-by Maurus Cuelenaere <[email protected]>
git rename detection please.
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH v2 1/4 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.
---
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%)
(quoted diff) +0 -0
b/arch/arm/mach-s3c2410/mach-h1940.c
index fbedd07..75e3ffb 100644
arch/arm/mach-s3c2410/mach-h1940.c +1 -1
@@ -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
@@ -37,8 +37,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 */
(quoted diff) +0 -0
b/arch/arm/plat-samsung/include/plat/ts.h 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
arch/arm/plat-samsung/include/plat/ts.h renamed from arch/arm/mach-s3c2410/include/mach/ts.h +1 -1
@@ -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]> *
(quoted diff) +0 -0
b/drivers/input/touchscreen/s3c2410_ts.c
index 6386b44..0cd0ca6 100644
drivers/input/touchscreen/s3c2410_ts.c +1 -1
@@ -38,9 +38,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.6.6.1