---

yaml --- r: 7484 b: refs/heads/master c: f7ceff3 h: refs/heads/master v: v3
git-mirror · Sep 7, 2005 · 49c911f · 49c911f
1 parent 4218c7a
commit 49c911f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3158106685acac8f8d4e74a17b974f160fe77c0b
+refs/heads/master: f7ceff348bbd2ef35b5bc2ab47541dcac4b0b8ea
diff --git a/trunk/arch/arm/mach-pxa/corgi.c b/trunk/arch/arm/mach-pxa/corgi.c
@@ -107,6 +107,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
  *
@@ -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)