summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-09-06 15:19:07 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:54 -0700
commitf7ceff348bbd2ef35b5bc2ab47541dcac4b0b8ea (patch)
tree118f8dda0656f933455391314a02dd1c810ca7bb
parent3158106685acac8f8d4e74a17b974f160fe77c0b (diff)
downloadlinux-sh-f7ceff348bbd2ef35b5bc2ab47541dcac4b0b8ea.tar.gz
[PATCH] Corgi: Add keyboard and touchscreen device definitions
Add keyboard and touchscreen device definitions for corgi. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/arm/mach-pxa/corgi.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 453be2948533..47da9fe57aa6 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -108,6 +108,27 @@ static struct platform_device corgibl_device = {
/*
+ * Corgi Keyboard Device
+ */
+static struct platform_device corgikbd_device = {
+ .name = "corgi-keyboard",
+ .id = -1,
+};
+
+
+/*
+ * Corgi Touch Screen Device
+ */
+static struct platform_device corgits_device = {
+ .name = "corgi-ts",
+ .dev = {
+ .parent = &corgissp_device.dev,
+ },
+ .id = -1,
+};
+
+
+/*
* MMC/SD Device
*
* The card detect interrupt isn't debounced so we delay it by HZ/4
@@ -183,6 +204,7 @@ static struct pxamci_platform_data corgi_mci_platform_data = {
};
+
/*
* USB Device Controller
*/
@@ -208,7 +230,9 @@ static struct platform_device *devices[] __initdata = {
&corgiscoop_device,
&corgissp_device,
&corgifb_device,
+ &corgikbd_device,
&corgibl_device,
+ &corgits_device,
};
static void __init corgi_init(void)