diff options
author | Darius Augulis <augulis.darius@gmail.com> | 2010-10-19 00:52:34 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-19 00:52:34 -0400 |
commit | 4374c456724abf99210c9d2aa419bd6ea8cddaa6 (patch) | |
tree | eddef649741951082a932bc77fb001942071dc18 | |
parent | 88fbadea18bd58a5a5ae2051e6bbbec7dcbacbb4 (diff) |
ARM: S3C64XX: add touchscreen support for mach-real6410
Add touchscreen device support for mach-real6410
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-real6410.c | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index e4aede13990d..b706b80cc968 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig | |||
@@ -107,6 +107,8 @@ config MACH_REAL6410 | |||
107 | select S3C_DEV_FB | 107 | select S3C_DEV_FB |
108 | select S3C64XX_SETUP_FB_24BPP | 108 | select S3C64XX_SETUP_FB_24BPP |
109 | select S3C_DEV_NAND | 109 | select S3C_DEV_NAND |
110 | select SAMSUNG_DEV_ADC | ||
111 | select SAMSUNG_DEV_TS | ||
110 | help | 112 | help |
111 | Machine support for the CoreWind REAL6410 | 113 | Machine support for the CoreWind REAL6410 |
112 | 114 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index 9fd943d76aad..bad6990eeb82 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -36,11 +36,13 @@ | |||
36 | #include <mach/regs-srom.h> | 36 | #include <mach/regs-srom.h> |
37 | #include <mach/s3c6410.h> | 37 | #include <mach/s3c6410.h> |
38 | 38 | ||
39 | #include <plat/adc.h> | ||
39 | #include <plat/cpu.h> | 40 | #include <plat/cpu.h> |
40 | #include <plat/devs.h> | 41 | #include <plat/devs.h> |
41 | #include <plat/fb.h> | 42 | #include <plat/fb.h> |
42 | #include <plat/nand.h> | 43 | #include <plat/nand.h> |
43 | #include <plat/regs-serial.h> | 44 | #include <plat/regs-serial.h> |
45 | #include <plat/ts.h> | ||
44 | 46 | ||
45 | #include <video/platform_lcd.h> | 47 | #include <video/platform_lcd.h> |
46 | 48 | ||
@@ -191,6 +193,14 @@ static struct platform_device *real6410_devices[] __initdata = { | |||
191 | &s3c_device_hsmmc1, | 193 | &s3c_device_hsmmc1, |
192 | &s3c_device_fb, | 194 | &s3c_device_fb, |
193 | &s3c_device_nand, | 195 | &s3c_device_nand, |
196 | &s3c_device_adc, | ||
197 | &s3c_device_ts, | ||
198 | }; | ||
199 | |||
200 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | ||
201 | .delay = 10000, | ||
202 | .presc = 49, | ||
203 | .oversampling_shift = 2, | ||
194 | }; | 204 | }; |
195 | 205 | ||
196 | static void __init real6410_map_io(void) | 206 | static void __init real6410_map_io(void) |
@@ -289,6 +299,7 @@ static void __init real6410_machine_init(void) | |||
289 | 299 | ||
290 | s3c_fb_set_platdata(&real6410_lcd_pdata); | 300 | s3c_fb_set_platdata(&real6410_lcd_pdata); |
291 | s3c_nand_set_platdata(&real6410_nand_info); | 301 | s3c_nand_set_platdata(&real6410_nand_info); |
302 | s3c24xx_ts_set_platdata(&s3c_ts_platform); | ||
292 | 303 | ||
293 | /* configure nCS1 width to 16 bits */ | 304 | /* configure nCS1 width to 16 bits */ |
294 | 305 | ||