brcm47xx: various fixes and code cleanups for irq code

[openwrt.git] / target / linux / brcm47xx / patches-3.6 / 237-bcma-bcm4716-bcm4748-i2s-irqflag.patch

diff --git a/target/linux/brcm47xx/patches-3.6/237-bcma-bcm4716-bcm4748-i2s-irqflag.patch b/target/linux/brcm47xx/patches-3.6/237-bcma-bcm4716-bcm4748-i2s-irqflag.patch
index e369abd..d77050d 100644 (file)
--- a/target/linux/brcm47xx/patches-3.6/237-bcma-bcm4716-bcm4748-i2s-irqflag.patch
+++ b/target/linux/brcm47xx/patches-3.6/237-bcma-bcm4716-bcm4748-i2s-irqflag.patch
@@ -10,7 +10,7 @@
  struct bcma_device;
 --- a/drivers/bcma/driver_mips.c
 +++ b/drivers/bcma/driver_mips.c
  struct bcma_device;
 --- a/drivers/bcma/driver_mips.c
 +++ b/drivers/bcma/driver_mips.c

-@@ -275,6 +275,32 @@ void bcma_core_mips_early_init(struct bc
+@@ -273,6 +273,32 @@ void bcma_core_mips_early_init(struct bc

        mcore->early_setup_done = true;
  }
  
        mcore->early_setup_done = true;
  }
  


@@ -43,12 +43,12 @@
  void bcma_core_mips_init(struct bcma_drv_mips *mcore)
  {
        struct bcma_bus *bus;
  void bcma_core_mips_init(struct bcma_drv_mips *mcore)
  {
        struct bcma_bus *bus;

-@@ -289,6 +315,8 @@ void bcma_core_mips_init(struct bcma_drv
+@@ -286,6 +312,8 @@ void bcma_core_mips_init(struct bcma_drv

  
        bcma_core_mips_early_init(mcore);
  
 +      bcma_fix_i2s_irqflag(bus);
 +
  
        bcma_core_mips_early_init(mcore);
  
 +      bcma_fix_i2s_irqflag(bus);
 +

-       mcore->assigned_irqs = 1;
- 

        switch (bus->chipinfo.id) {
        switch (bus->chipinfo.id) {

+       case BCMA_CHIP_ID_BCM4716:
+       case BCMA_CHIP_ID_BCM4748: