aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDarius Augulis <augulis.darius@gmail.com>2010-10-19 03:10:02 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-10-20 18:42:45 -0400
commitfe894f97ad89951a7bdb150ad5645178b89fd6b7 (patch)
treec9d7f417e7f392a55ee3ab763b87fab12a10fa8b /arch
parentbbd7ac63a6bfdb7bd10471441b431b283e96edad (diff)
ARM: S3C64XX: add touchscreen support for mach-mini6410
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig2
-rw-r--r--arch/arm/mach-s3c64xx/mach-mini6410.c12
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index b514e3a98fc7..fe1fd3007ae4 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -108,6 +108,8 @@ config MACH_MINI6410
108 select S3C_DEV_NAND 108 select S3C_DEV_NAND
109 select S3C_DEV_FB 109 select S3C_DEV_FB
110 select S3C64XX_SETUP_FB_24BPP 110 select S3C64XX_SETUP_FB_24BPP
111 select SAMSUNG_DEV_ADC
112 select SAMSUNG_DEV_TS
111 help 113 help
112 Machine support for the FriendlyARM MINI6410 114 Machine support for the FriendlyARM MINI6410
113 115
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 0e3516ee1086..249c62956471 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -35,11 +35,14 @@
35#include <mach/regs-srom.h> 35#include <mach/regs-srom.h>
36#include <mach/s3c6410.h> 36#include <mach/s3c6410.h>
37 37
38#include <plat/adc.h>
38#include <plat/cpu.h> 39#include <plat/cpu.h>
39#include <plat/devs.h> 40#include <plat/devs.h>
40#include <plat/fb.h> 41#include <plat/fb.h>
41#include <plat/nand.h> 42#include <plat/nand.h>
42#include <plat/regs-serial.h> 43#include <plat/regs-serial.h>
44#include <plat/ts.h>
45
43#include <video/platform_lcd.h> 46#include <video/platform_lcd.h>
44 47
45#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK) 48#define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK)
@@ -202,6 +205,12 @@ static struct platform_device mini6410_lcd_powerdev = {
202 .dev.platform_data = &mini6410_lcd_power_data, 205 .dev.platform_data = &mini6410_lcd_power_data,
203}; 206};
204 207
208static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
209 .delay = 10000,
210 .presc = 49,
211 .oversampling_shift = 2,
212};
213
205static struct platform_device *mini6410_devices[] __initdata = { 214static struct platform_device *mini6410_devices[] __initdata = {
206 &mini6410_device_eth, 215 &mini6410_device_eth,
207 &s3c_device_hsmmc0, 216 &s3c_device_hsmmc0,
@@ -210,6 +219,8 @@ static struct platform_device *mini6410_devices[] __initdata = {
210 &s3c_device_nand, 219 &s3c_device_nand,
211 &s3c_device_fb, 220 &s3c_device_fb,
212 &mini6410_lcd_powerdev, 221 &mini6410_lcd_powerdev,
222 &s3c_device_adc,
223 &s3c_device_ts,
213}; 224};
214 225
215static void __init mini6410_map_io(void) 226static void __init mini6410_map_io(void)
@@ -308,6 +319,7 @@ static void __init mini6410_machine_init(void)
308 319
309 s3c_nand_set_platdata(&mini6410_nand_info); 320 s3c_nand_set_platdata(&mini6410_nand_info);
310 s3c_fb_set_platdata(&mini6410_lcd_pdata); 321 s3c_fb_set_platdata(&mini6410_lcd_pdata);
322 s3c24xx_ts_set_platdata(&s3c_ts_platform);
311 323
312 /* configure nCS1 width to 16 bits */ 324 /* configure nCS1 width to 16 bits */
313 325