summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100/mach-smdkc100.c
diff options
context:
space:
mode:
authorNaveen Krishna Ch <ch.naveen@samsung.com>2010-06-30 14:50:24 +0200
committerKukjin Kim <kgene.kim@samsung.com>2010-08-05 11:30:50 +0200
commit327b90305e9c8a5fecf663788301927efbeaeb6d (patch)
tree2591b4d4a0ce3025300c1f27360d652756a862c2 /arch/arm/mach-s5pc100/mach-smdkc100.c
parentARM: S5PC100: Add support for Compact Flash driver on SMDKC100 (diff)
downloadlinux-327b90305e9c8a5fecf663788301927efbeaeb6d.tar.xz
linux-327b90305e9c8a5fecf663788301927efbeaeb6d.zip
ARM: S5PC100: Add Touchscreen support.
This patch adds touchscreen support for S5PC100. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pc100/mach-smdkc100.c')
-rw-r--r--arch/arm/mach-s5pc100/mach-smdkc100.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index b97830ab396a..1c637c9ed1bd 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -43,6 +43,8 @@
#include <plat/fb.h>
#include <plat/iic.h>
#include <plat/ata.h>
+#include <plat/adc.h>
+#include <plat/ts.h>
/* Following are default values for UCON, ULCON and UFCON UART registers */
#define S5PC100_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -155,18 +157,29 @@ static struct s3c_ide_platdata smdkc100_ide_pdata __initdata = {
};
static struct platform_device *smdkc100_devices[] __initdata = {
+<<<<<<< HEAD:arch/arm/mach-s5pc100/mach-smdkc100.c
&s3c_device_cfcon,
+=======
+ &s3c_device_adc,
+>>>>>>> c1b6d71... ARM: S5PC100: Add Touchscreen support.:arch/arm/mach-s5pc100/mach-smdkc100.c
&s3c_device_i2c0,
&s3c_device_i2c1,
&s3c_device_fb,
&s3c_device_hsmmc0,
&s3c_device_hsmmc1,
&s3c_device_hsmmc2,
+ &s3c_device_ts,
&smdkc100_lcd_powerdev,
&s5pc100_device_iis0,
&s5pc100_device_ac97,
};
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+ .delay = 10000,
+ .presc = 49,
+ .oversampling_shift = 2,
+};
+
static void __init smdkc100_map_io(void)
{
s5p_init_io(NULL, 0, S5P_VA_CHIPID);
@@ -176,6 +189,8 @@ static void __init smdkc100_map_io(void)
static void __init smdkc100_machine_init(void)
{
+ s3c24xx_ts_set_platdata(&s3c_ts_platform);
+
/* I2C */
s3c_i2c0_set_platdata(NULL);
s3c_i2c1_set_platdata(NULL);