---

yaml --- r: 90936 b: refs/heads/master c: 67908ab h: refs/heads/master v: v3
git-mirror · Apr 18, 2008 · 658048c · 658048c
1 parent c091178
commit 658048c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 577958671eadf5ab1deed66f99cdbe67b502ea66
+refs/heads/master: 67908abf02fb83dee1730adf70d9e31367119190
diff --git a/trunk/arch/sh/boards/renesas/migor/setup.c b/trunk/arch/sh/boards/renesas/migor/setup.c
@@ -202,6 +202,10 @@ static struct i2c_board_info __initdata migor_i2c_devices[] = {
 		I2C_BOARD_INFO("rtc-rs5c372", 0x32),
 		.type   = "rs5c372b",
 	},
+	{
+		I2C_BOARD_INFO("migor_ts", 0x51),
+		.irq = 38, /* IRQ6 */
+	},
 };
 
 static int __init migor_devices_setup(void)
@@ -233,6 +237,11 @@ static void __init migor_setup(char **cmdline_p)
 
 	/* I2C */
 	ctrl_outl(ctrl_inl(MSTPCR1) & ~0x00000200, MSTPCR1);
+
+	/* Touch Panel - Enable IRQ6 */
+	ctrl_outw(ctrl_inw(PORT_PZCR) & ~0xc, PORT_PZCR);
+	ctrl_outw((ctrl_inw(PORT_PSELA) | 0x8000), PORT_PSELA);
+	ctrl_outw((ctrl_inw(PORT_HIZCRC) & ~0x4000), PORT_HIZCRC);
 }
 
 static struct sh_machine_vector mv_migor __initmv = {