ARM: OMAP: GPIO IRQSTATUS2 workaround applies to 2430

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / gpio.c

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index cea20f747f96f952b2ac4042b02ffb28020579a9..1640a37dd3460a27bb6d7ec90843fde6f2a6e906 100644 (file)
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -709,7 +709,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
 
        /* Workaround for clearing DSP GPIO interrupts to allow retention */
 #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
-       if (cpu_is_omap2420() || cpu_is_omap34xx())
+       if (cpu_is_omap24xx() || cpu_is_omap34xx())
                __raw_writel(gpio_mask, bank->base + OMAP24XX_GPIO_IRQSTATUS2);
 #endif
 }
@@ -1277,8 +1277,11 @@ static inline void mpuio_init(void) {}
 /*---------------------------------------------------------------------*/
 
 static int initialized;
-#if !defined(CONFIG_ARCH_OMAP34XX)
+#if !defined(CONFIG_ARCH_OMAP3)
 static struct clk * gpio_ick;
+#endif
+
+#if defined(CONFIG_ARCH_OMAP2)
 static struct clk * gpio_fck;
 #endif
 
@@ -1296,7 +1299,9 @@ static int __init _omap_gpio_init(void)
 {
        int i;
        struct gpio_bank *bank;
+#if defined(CONFIG_ARCH_OMAP3)
        char clk_name[11];
+#endif
 
        initialized = 1;