]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: S3C64XX: add touchscreen support for mach-real6410
authorDarius Augulis <augulis.darius@gmail.com>
Tue, 19 Oct 2010 04:52:34 +0000 (13:52 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 19 Oct 2010 04:52:34 +0000 (13:52 +0900)
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>
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/mach-real6410.c

index e4aede13990d4ef41f557597d715a9511c788613..b706b80cc968f7434bfdf2fd41fb8135a7034b3d 100644 (file)
@@ -107,6 +107,8 @@ config MACH_REAL6410
        select S3C_DEV_FB
        select S3C64XX_SETUP_FB_24BPP
        select S3C_DEV_NAND
+       select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_TS
        help
          Machine support for the CoreWind REAL6410
 
index 9fd943d76aad812bf046592c8eac190e82df0ec9..bad6990eeb822462461eb1f68704d3a5ec0f846c 100644 (file)
 #include <mach/regs-srom.h>
 #include <mach/s3c6410.h>
 
+#include <plat/adc.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/nand.h>
 #include <plat/regs-serial.h>
+#include <plat/ts.h>
 
 #include <video/platform_lcd.h>
 
@@ -191,6 +193,14 @@ static struct platform_device *real6410_devices[] __initdata = {
        &s3c_device_hsmmc1,
        &s3c_device_fb,
        &s3c_device_nand,
+       &s3c_device_adc,
+       &s3c_device_ts,
+};
+
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+       .delay                  = 10000,
+       .presc                  = 49,
+       .oversampling_shift     = 2,
 };
 
 static void __init real6410_map_io(void)
@@ -289,6 +299,7 @@ static void __init real6410_machine_init(void)
 
        s3c_fb_set_platdata(&real6410_lcd_pdata);
        s3c_nand_set_platdata(&real6410_nand_info);
+       s3c24xx_ts_set_platdata(&s3c_ts_platform);
 
        /* configure nCS1 width to 16 bits */