atheros: merge gpio changes from r18036 to 8.09

SVN-Revision: 18037

diff --git a/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c b/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
index 581b1a4a10187244ff08bae8202d94de46d988dc..87ced6693bc87d40621f6ec81732484bf6c53ed5 100644 (file)
--- a/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
+++ b/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
@@ -33,6 +33,8 @@ static u32 gpiointmask = 0, gpiointval = 0;
 static inline void ar5315_gpio_irq(void)
 {
        u32 pend;
+       u32 gpio;
+
        sysRegWrite(AR5315_ISR, sysRegRead(AR5315_IMR) | ~AR5315_ISR_GPIO);
 
        /* only do one gpio interrupt at a time */
@@ -40,7 +42,13 @@ static inline void ar5315_gpio_irq(void)
        if (!pend)
                return;
 
-       do_IRQ(AR531X_GPIO_IRQ_BASE + fls(pend) - 1);
+       gpio = fls(pend) - 1;
+
+       /* check if GPIO line is input */
+       if ((sysRegRead(AR5315_GPIO_CR) & (AR5315_GPIO_CR_M(gpio))) != AR5315_GPIO_CR_I(gpio))
+               return;
+
+       do_IRQ(AR531X_GPIO_IRQ_BASE + gpio);
 }
 
 
@@ -116,8 +124,9 @@ static void ar5315_gpio_intr_enable(unsigned int irq)
        mask = 1 << gpio;
        gpiointmask |= mask;
 
-       /* reconfigure GPIO line as input */
-       sysRegMask(AR5315_GPIO_CR, AR5315_GPIO_CR_M(gpio), AR5315_GPIO_CR_I(gpio));
+       /* check if GPIO line is input */
+       if ((sysRegRead(AR5315_GPIO_CR) & (AR5315_GPIO_CR_M(gpio))) != AR5315_GPIO_CR_I(gpio))
+               return;
 
        /* Enable interrupt with edge detection */
        sysRegMask(AR5315_GPIO_INT, AR5315_GPIO_INT_M | AR5315_GPIO_INT_LVL_M, gpio | AR5315_GPIO_INT_LVL(3));
@@ -138,6 +147,11 @@ static void ar5315_gpio_intr_disable(unsigned int irq)
 /* Turn on the specified AR531X_MISC_IRQ interrupt */
 static unsigned int ar5315_gpio_intr_startup(unsigned int irq)
 {
+       u32 gpio = irq - AR531X_GPIO_IRQ_BASE;
+
+       /* reconfigure GPIO line as input */
+       sysRegMask(AR5315_GPIO_CR, AR5315_GPIO_CR_M(gpio), AR5315_GPIO_CR_I(gpio));
+
        ar5315_gpio_intr_enable(irq);
        return 0;
 }