From 8d7281f76ef9042883d5d172f1fc75d3a35b0467 Mon Sep 17 00:00:00 2001
From: wanzongshun <mcuos.com@gmail.com>
Date: Fri, 1 May 2009 16:13:05 +0100
Subject: [PATCH] --- yaml --- r: 149291 b: refs/heads/master c:
 432818f08fa5cf983e13b0ac32ec59b0951882b9 h: refs/heads/master i:   149289:
 159320130256a83f381c11824af3d22eec36c2d7   149287:
 864f93cef01571c7cafaff23008b11fcdb56e0b8 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-w90x900/mach-w90p910evb.c | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 69575233ead8..258d9e2dff53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 177dd6bb8c70885bfe3c269bf21dab1c4aeaf5c3
+refs/heads/master: 432818f08fa5cf983e13b0ac32ec59b0951882b9
diff --git a/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c b/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c
index 578a50910c0a..26de71f73f47 100644
--- a/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c
+++ b/trunk/arch/arm/mach-w90x900/mach-w90p910evb.c
@@ -135,6 +135,29 @@ struct platform_device w90x900_device_usb_ohci = {
 };
 EXPORT_SYMBOL(w90x900_device_usb_ohci);
 
+/*TouchScreen controller*/
+
+static struct resource w90x900_ts_resource[] = {
+	[0] = {
+		.start = W90X900_PA_ADC,
+		.end   = W90X900_PA_ADC + W90X900_SZ_ADC-1,
+		.flags = IORESOURCE_MEM,
+	},
+	[1] = {
+		.start = IRQ_ADC,
+		.end   = IRQ_ADC,
+		.flags = IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device w90x900_device_ts = {
+	.name		= "w90x900-ts",
+	.id		= -1,
+	.resource	= w90x900_ts_resource,
+	.num_resources	= ARRAY_SIZE(w90x900_ts_resource),
+};
+EXPORT_SYMBOL(w90x900_device_ts);
+
 static struct map_desc w90p910_iodesc[] __initdata = {
 };
 
@@ -145,6 +168,7 @@ static struct platform_device *w90p910evb_dev[] __initdata = {
 	&w90p910_flash_device,
 	&w90x900_device_usb_ehci,
 	&w90x900_device_usb_ohci,
+	&w90x900_device_ts,
 };
 
 static void __init w90p910evb_map_io(void)