public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Darius Augulis <augulis.darius@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: kgene.kim@samsung.com, paulius.zaleckas@gmail.com,
	linux-kernel@vger.kernel.org, ben-linux@fluff.org
Subject: [PATCH 9/9] ARM: S3C64XX: add touchscreen support for mach-mini6410
Date: Wed, 29 Sep 2010 22:37:04 +0300	[thread overview]
Message-ID: <20100929193649.25307.66741.stgit@darius-desktop> (raw)
In-Reply-To: <20100929192354.25307.40197.stgit@darius-desktop>

Add touchscreen device support for mach-mini6410

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
---
 arch/arm/mach-s3c64xx/Kconfig         |    2 ++
 arch/arm/mach-s3c64xx/mach-mini6410.c |   12 ++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index b514e3a..fe1fd30 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -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
 
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 90f1976..2c585a7 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -35,11 +35,14 @@
 #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 */
 


      parent reply	other threads:[~2010-09-29 19:37 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-29 19:30 [PATCH 0/9] ARM: S3C64XX: real6410 and mini6410 patches for next Darius Augulis
2010-09-29 19:31 ` [PATCH 1/9] ARM: S3C64XX: add frame buffer support for mach-real6410 Darius Augulis
2010-10-18 13:18   ` Kukjin Kim
2010-10-18 13:27     ` Darius Augulis
2010-09-29 19:33 ` [PATCH 2/9 v2] ARM: S3C64XX: add nand " Darius Augulis
2010-10-18 13:23   ` Kukjin Kim
2010-10-18 13:50     ` Darius Augulis
2010-10-18 13:59     ` Darius Augulis
2010-10-19  2:47       ` Kukjin Kim
2010-09-29 19:33 ` [PATCH 3/9] ARM: S3C64XX: add touchscreen " Darius Augulis
2010-10-18 13:29   ` Kukjin Kim
2010-10-18 13:39     ` Darius Augulis
2010-10-18 13:45       ` Kukjin Kim
2010-09-29 19:34 ` [PATCH 4/9] ARM: S3C64XX: add USB host " Darius Augulis
2010-10-18 13:39   ` Kukjin Kim
2010-10-18 13:46     ` Darius Augulis
2010-10-19  2:41       ` Kukjin Kim
2010-10-19  6:15         ` Darius Augulis
2010-09-29 19:35 ` [PATCH 5/9 v2] ARM: S3C64XX: add support for mach-mini6410 Darius Augulis
2010-10-19  7:08   ` Kukjin Kim
2010-09-29 19:35 ` [PATCH 6/9] ARM: S3C64XX: add nand " Darius Augulis
2010-09-29 19:36 ` [PATCH 7/9] ARM: S3C64XX: add frame buffer " Darius Augulis
2010-09-29 19:36 ` [PATCH 8/9] ARM: S3C64XX: add backlight control " Darius Augulis
2010-09-29 19:37 ` Darius Augulis [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100929193649.25307.66741.stgit@darius-desktop \
    --to=augulis.darius@gmail.com \
    --cc=ben-linux@fluff.org \
    --cc=kgene.kim@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paulius.zaleckas@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox