From: Marek Belisko <marek.belisko@open-nandra.com>
To: ben-linux@fluff.org
Cc: linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, rpurdie@rpsys.net,
esta1ien@gmail.com, buserror@gmail.com,
Marek Belisko <marek.belisko@open-nandra.com>
Subject: [PATCH 2/4] s3c2440: mini2440: Add touchscreen support for mini2440.
Date: Tue, 29 Mar 2011 08:32:41 +0200 [thread overview]
Message-ID: <1301380363-3282-3-git-send-email-marek.belisko@open-nandra.com> (raw)
In-Reply-To: <1301380363-3282-1-git-send-email-marek.belisko@open-nandra.com>
Patch add support for mini2440 touchscreen.
Some code borrowed from:
git://repo.or.cz/linux-2.6/mini2440.git
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
arch/arm/mach-s3c2440/mach-mini2440.c | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index ce152b4..163d318 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -47,6 +47,7 @@
#include <plat/iic.h>
#include <plat/mci.h>
#include <plat/udc.h>
+#include <plat/ts.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
@@ -530,6 +531,11 @@ static struct platform_device uda1340_codec = {
.id = -1,
};
+static struct s3c2410_ts_mach_info mini2440_ts_cfg __initdata = {
+ .delay = 10000,
+ .presc = 0xff, /* slow as we can go */
+};
+
static struct platform_device *mini2440_devices[] __initdata = {
&s3c_device_ohci,
&s3c_device_wdt,
@@ -548,6 +554,7 @@ static struct platform_device *mini2440_devices[] __initdata = {
&uda1340_codec,
&mini2440_audio,
&samsung_asoc_dma,
+ &s3c_device_adc,
};
static void __init mini2440_map_io(void)
@@ -631,8 +638,13 @@ static void mini2440_parse_features(
features->done |= FEATURE_BACKLIGHT;
break;
case 't':
- printk(KERN_INFO "MINI2440: '%c' ignored, "
- "touchscreen not compiled in\n", f);
+ if (features->done & FEATURE_TOUCH)
+ printk(KERN_INFO "MINI2440: '%c' ignored, "
+ "touchscreen already set\n", f);
+ else
+ features->optional[features->count++] =
+ &s3c_device_ts;
+ features->done |= FEATURE_TOUCH;
break;
case 'c':
if (features->done & FEATURE_CAMERA)
@@ -699,6 +711,7 @@ static void __init mini2440_init(void)
s3c24xx_mci_set_platdata(&mini2440_mmc_cfg);
s3c_nand_set_platdata(&mini2440_nand_info);
s3c_i2c0_set_platdata(NULL);
+ s3c24xx_ts_set_platdata(&mini2440_ts_cfg);
i2c_register_board_info(0, mini2440_i2c_devs,
ARRAY_SIZE(mini2440_i2c_devs));
--
1.7.1
next prev parent reply other threads:[~2011-03-29 6:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-29 6:32 [PATCH 0/4] s3c2440: mini2440: Add missing code parts to be fully working with latest kernel Marek Belisko
2011-03-29 6:32 ` [PATCH 1/4] s3c2440: mini2440: Add support for new LCD panels Marek Belisko
2011-03-29 6:32 ` Marek Belisko [this message]
2011-03-29 6:32 ` [PATCH 3/4] s3c2440: mini2440: Select touchscreen by default Marek Belisko
2011-03-29 6:32 ` [PATCH 4/4] s3c2440: mini2440: Enable the backlight LED earlier at boot time Marek Belisko
2011-03-29 8:50 ` Vasily Khoruzhick
2011-03-29 8:55 ` Belisko Marek
2011-03-29 9:53 ` [PATCH] s3c2440: mini2440: Use leds-gpio driver for board leds handling Marek Belisko
2011-03-29 9:59 ` Belisko Marek
2011-03-29 12:58 ` Vasily Khoruzhick
2011-03-29 7:20 ` [PATCH 0/4] s3c2440: mini2440: Add missing code parts to be fully working with latest kernel M P
2011-03-29 7:23 ` Belisko Marek
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=1301380363-3282-3-git-send-email-marek.belisko@open-nandra.com \
--to=marek.belisko@open-nandra.com \
--cc=ben-linux@fluff.org \
--cc=buserror@gmail.com \
--cc=esta1ien@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rpurdie@rpsys.net \
/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
all inboxes | Powered by JetHome®