]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: S3C64XX: add touchscreen support for mach-mini6410
authorDarius Augulis <augulis.darius@gmail.com>
Tue, 19 Oct 2010 07:10:02 +0000 (16:10 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 20 Oct 2010 22:42:45 +0000 (07:42 +0900)
Add touchscreen device support for mach-mini6410

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-mini6410.c

index b514e3a98fc775b8a126b8dcca1e8960912afb8c..fe1fd3007ae44fab51ca8cf6b3960ad364d67efb 100644 (file)
@@ -108,6 +108,8 @@ config MACH_MINI6410
        select S3C_DEV_NAND
        select S3C_DEV_FB
        select S3C64XX_SETUP_FB_24BPP
+       select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_TS
        help
          Machine support for the FriendlyARM MINI6410
 
index 0e3516ee10863ce667ea8d21262cf12a379972c0..249c62956471a04b970c082fb7eaf011373de9af 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>
 
 #define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
@@ -202,6 +205,12 @@ static struct platform_device mini6410_lcd_powerdev = {
        .dev.platform_data      = &mini6410_lcd_power_data,
 };
 
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+       .delay                  = 10000,
+       .presc                  = 49,
+       .oversampling_shift     = 2,
+};
+
 static struct platform_device *mini6410_devices[] __initdata = {
        &mini6410_device_eth,
        &s3c_device_hsmmc0,
@@ -210,6 +219,8 @@ static struct platform_device *mini6410_devices[] __initdata = {
        &s3c_device_nand,
        &s3c_device_fb,
        &mini6410_lcd_powerdev,
+       &s3c_device_adc,
+       &s3c_device_ts,
 };
 
 static void __init mini6410_map_io(void)
@@ -308,6 +319,7 @@ static void __init mini6410_machine_init(void)
 
        s3c_nand_set_platdata(&mini6410_nand_info);
        s3c_fb_set_platdata(&mini6410_lcd_pdata);
+       s3c24xx_ts_set_platdata(&s3c_ts_platform);
 
        /* configure nCS1 width to 16 bits */