diff options
author | Naveen Krishna Ch <ch.naveen@samsung.com> | 2010-05-19 22:39:54 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 01:15:50 -0400 |
commit | 41d8289d161e23e9cff78c914b6f37f30e627ea2 (patch) | |
tree | 19b1312a4e88490739d6cfba26347a008bd6b1f9 /arch/arm/mach-s5pv210 | |
parent | 09cae8f195c5be8d3102022c7ecd1653b3653233 (diff) |
ARM: S5PV210: Add Touchscreen support for S5PV210
This patch adds touchscreen support for S5PV210.
Note: TSADC in S5PV210 support 2 touchscreen interfaces,
Only 1 is implemented as of now.
Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
[ben-linux@fluff.org: minor title fix]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 11 |
4 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 7601c28e240b..b05988f21ec2 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -25,6 +25,8 @@ config MACH_SMDKV210 | |||
25 | bool "SMDKV210" | 25 | bool "SMDKV210" |
26 | select CPU_S5PV210 | 26 | select CPU_S5PV210 |
27 | select ARCH_SPARSEMEM_ENABLE | 27 | select ARCH_SPARSEMEM_ENABLE |
28 | select SAMSUNG_DEV_ADC | ||
29 | select SAMSUNG_DEV_TS | ||
28 | help | 30 | help |
29 | Machine support for Samsung SMDKV210 | 31 | Machine support for Samsung SMDKV210 |
30 | 32 | ||
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 2b776eb5d150..359bdc8f3b66 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
@@ -74,6 +74,8 @@ static void s5pv210_idle(void) | |||
74 | 74 | ||
75 | void __init s5pv210_map_io(void) | 75 | void __init s5pv210_map_io(void) |
76 | { | 76 | { |
77 | s3c_device_adc.name = "s3c64xx-adc"; | ||
78 | |||
77 | iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); | 79 | iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); |
78 | } | 80 | } |
79 | 81 | ||
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 5adcb9f26e44..e85957083055 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h | |||
@@ -75,8 +75,11 @@ | |||
75 | /* AC97 */ | 75 | /* AC97 */ |
76 | #define S5PV210_PA_AC97 0xE2200000 | 76 | #define S5PV210_PA_AC97 0xE2200000 |
77 | 77 | ||
78 | #define S5PV210_PA_ADC (0xE1700000) | ||
79 | |||
78 | /* compatibiltiy defines. */ | 80 | /* compatibiltiy defines. */ |
79 | #define S3C_PA_UART S5PV210_PA_UART | 81 | #define S3C_PA_UART S5PV210_PA_UART |
80 | #define S3C_PA_IIC S5PV210_PA_IIC0 | 82 | #define S3C_PA_IIC S5PV210_PA_IIC0 |
83 | #define SAMSUNG_PA_ADC S5PV210_PA_ADC | ||
81 | 84 | ||
82 | #endif /* __ASM_ARCH_MAP_H */ | 85 | #endif /* __ASM_ARCH_MAP_H */ |
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 3c29e18528a5..b92beb6831ae 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include <plat/s5pv210.h> | 25 | #include <plat/s5pv210.h> |
26 | #include <plat/devs.h> | 26 | #include <plat/devs.h> |
27 | #include <plat/cpu.h> | 27 | #include <plat/cpu.h> |
28 | #include <plat/adc.h> | ||
29 | #include <plat/ts.h> | ||
28 | 30 | ||
29 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 31 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
30 | #define S5PV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 32 | #define S5PV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
@@ -74,6 +76,14 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = { | |||
74 | static struct platform_device *smdkv210_devices[] __initdata = { | 76 | static struct platform_device *smdkv210_devices[] __initdata = { |
75 | &s5pv210_device_iis0, | 77 | &s5pv210_device_iis0, |
76 | &s5pv210_device_ac97, | 78 | &s5pv210_device_ac97, |
79 | &s3c_device_adc, | ||
80 | &s3c_device_ts, | ||
81 | }; | ||
82 | |||
83 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | ||
84 | .delay = 10000, | ||
85 | .presc = 49, | ||
86 | .oversampling_shift = 2, | ||
77 | }; | 87 | }; |
78 | 88 | ||
79 | static void __init smdkv210_map_io(void) | 89 | static void __init smdkv210_map_io(void) |
@@ -85,6 +95,7 @@ static void __init smdkv210_map_io(void) | |||
85 | 95 | ||
86 | static void __init smdkv210_machine_init(void) | 96 | static void __init smdkv210_machine_init(void) |
87 | { | 97 | { |
98 | s3c24xx_ts_set_platdata(&s3c_ts_platform); | ||
88 | platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices)); | 99 | platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices)); |
89 | } | 100 | } |
90 | 101 | ||