atheros: move AR2315 misc IRQ dispatching to separate function

[openwrt/openwrt.git] / target / linux / atheros / patches-3.10 / 105-ar2315_pci.patch

diff --git a/target/linux/atheros/patches-3.10/105-ar2315_pci.patch b/target/linux/atheros/patches-3.10/105-ar2315_pci.patch
index 7108d6c75f87360b02d9e622b849a9a08ca9022c..8b080d8593bd3f9705757a17349a7ae85c6cd246 100644 (file)
--- a/target/linux/atheros/patches-3.10/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.10/105-ar2315_pci.patch
@@ -7,7 +7,7 @@
 +obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o
 --- /dev/null
 +++ b/arch/mips/ar231x/pci.c
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,234 @@
 +/*
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
@@ -235,8 +235,6 @@
 +      /* dirty hack - anyone with a datasheet that knows the memory map ? */
 +      ioport_resource.start = 0x10000000;
 +      ioport_resource.end = 0xffffffff;
-+      iomem_resource.start = 0x10000000;
-+      iomem_resource.end = 0xffffffff;
 +
 +      register_pci_controller(&ar231x_pci_controller);
 +
@@ -259,8 +257,8 @@
 +      default y
 --- a/arch/mips/ar231x/ar2315.c
 +++ b/arch/mips/ar231x/ar2315.c
-@@ -65,6 +65,27 @@ static inline void ar2315_gpio_irq(void)
-               do_IRQ(AR531X_GPIO_IRQ_BASE + bit);
+@@ -88,6 +88,28 @@ ar2315_misc_irq_dispatch(void)
+               do_IRQ(AR531X_MISC_IRQ_NONE);
  }
  
 +#ifdef CONFIG_ATHEROS_AR2315_PCI
@@ -284,10 +282,11 @@
 +      }
 +}
 +#endif /* CONFIG_ATHEROS_AR2315_PCI */
- 
++
  /*
   * Called when an interrupt is received, this function
-@@ -83,6 +104,10 @@ ar2315_irq_dispatch(void)
+  * determines exactly which interrupt it was, and it
+@@ -105,6 +127,10 @@ ar2315_irq_dispatch(void)
                do_IRQ(AR2315_IRQ_WLAN0_INTRS);
        else if (pending & CAUSEF_IP4)
                do_IRQ(AR2315_IRQ_ENET0_INTRS);
@@ -295,6 +294,6 @@
 +      else if (pending & CAUSEF_IP5)
 +              ar2315_pci_irq(AR2315_IRQ_LCBUS_PCI);
 +#endif
-       else if (pending & CAUSEF_IP2) {
-               unsigned int misc_intr = ar231x_read_reg(AR2315_ISR) &
-                                        ar231x_read_reg(AR2315_IMR);
+       else if (pending & CAUSEF_IP2)
+               ar2315_misc_irq_dispatch();
+       else if (pending & CAUSEF_IP7)