From: David Brownell <dbrownell@users.sourceforge.net>
Date: Wed, 13 Jun 2007 12:40:43 +0000 (+0530)
Subject: ARM: OMAP: Tweak Trilok's h4 i2c boardinfo patch:
X-Git-Tag: v2.6.22-omap1~39
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=05731fafbdeb24b90dff48ec4ee195f494432075;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Tweak Trilok's h4 i2c boardinfo patch:

 - Don't #ifdef
 - Declare the rv5c387a RTC too
 - Move irq pinmux out of the driver into board-specific init

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Trilok Soni <soni.trilok@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 386f59d44a8..cacfab966d0 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -493,12 +493,15 @@ static void __init tusb_evm_setup(void)
 #endif
 
 static struct i2c_board_info __initdata h4_i2c_board_info[] = {
-#ifdef CONFIG_MENELAUS
+	{
+		I2C_BOARD_INFO("rtc-rs5c372", 0x32),
+		.type = "rv5c387a",
+		/* no IRQ wired to OMAP; nINTB goes to AGPS */
+	},
 	{
 		I2C_BOARD_INFO("menelaus", 0x72),
 		.irq = INT_24XX_SYS_NIRQ,
 	},
-#endif
 };
 
 static void __init omap_h4_init(void)
@@ -529,6 +532,9 @@ static void __init omap_h4_init(void)
 	omap_cfg_reg(V19_24XX_USB1_RCV);
 #endif
 
+	/* Menelaus interrupt */
+	omap_cfg_reg(W19_24XX_SYS_NIRQ);
+
 	i2c_register_board_info(1, h4_i2c_board_info,
 			ARRAY_SIZE(h4_i2c_board_info));