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 386f59d44a8e9527695699a2b438370b793e881d..cacfab966d0a7971b9f3cc6edf250e6cc517b6fb 100644 (file)
--- 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));