kernel: update bcma and ssb to master-2013-01-09 from wireless-testing

[openwrt.git] / target / linux / brcm47xx / patches-3.6 / 183-bcma-mips-show-also-disabled-irqs.patch

diff --git a/target/linux/brcm47xx/patches-3.6/183-bcma-mips-show-also-disabled-irqs.patch b/target/linux/brcm47xx/patches-3.6/183-bcma-mips-show-also-disabled-irqs.patch
deleted file mode 100644 (file)
index d44b306..0000000
--- a/target/linux/brcm47xx/patches-3.6/183-bcma-mips-show-also-disabled-irqs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/drivers/bcma/driver_mips.c
-+++ b/drivers/bcma/driver_mips.c
-@@ -75,11 +75,16 @@ static u32 bcma_core_mips_irqflag(struct
-               return dev->core_index;
-       flag = bcma_aread32(dev, BCMA_MIPS_OOBSELOUTA30);
- 
--      return flag & 0x1F;
-+      if (flag)
-+              return flag & 0x1F;
-+      else
-+              return 0x3f;
- }
- 
- /* Get the MIPS IRQ assignment for a specified device.
-  * If unassigned, 0 is returned.
-+ * If disabled, 5 is returned.
-+ * If not supported, 6 is returned.
-  */
- unsigned int bcma_core_mips_irq(struct bcma_device *dev)
- {
-@@ -88,13 +93,15 @@ unsigned int bcma_core_mips_irq(struct b
-       unsigned int irq;
- 
-       irqflag = bcma_core_mips_irqflag(dev);
-+      if (irqflag == 0x3f)
-+              return 6;
- 
--      for (irq = 1; irq <= 4; irq++)
-+      for (irq = 0; irq <= 4; irq++)
-               if (bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq)) &
-                   (1 << irqflag))
-                       return irq;
- 
--      return 0;
-+      return 5;
- }
- EXPORT_SYMBOL(bcma_core_mips_irq);
- 
-@@ -115,7 +122,7 @@ static void bcma_core_mips_set_irq(struc
-               bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0),
-                           bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
-                           ~(1 << irqflag));
--      else
-+      else if (oldirq != 5)
-               bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);
- 
-       /* assign the new one */
-@@ -145,7 +152,7 @@ static void bcma_core_mips_set_irq(struc
-       }
- 
-       bcma_debug(bus, "set_irq: core 0x%04x, irq %d => %d\n",
--                 dev->id.id, oldirq + 2, irq + 2);
-+                 dev->id.id, oldirq <= 4 ? oldirq + 2 : 0, irq + 2);
- }
- 
- static void bcma_core_mips_set_irq_name(struct bcma_bus *bus, unsigned int irq,