kernel: backport SSB/BCMA changes in preparation for a compat-wireless update

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36367 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 15 insertions, 15 deletions

diff --git a/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch b/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch
index c40a58eca..1dfb35dc2 100644
--- a/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch
+++ b/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch
@@ -476,7 +476,7 @@
  #define SSB_CHIPCO_BCAST_ADDR		0x0050
  #define SSB_CHIPCO_BCAST_DATA		0x0054
  #define SSB_CHIPCO_GPIOPULLUP		0x0058		/* Rev >= 20 only */
-@@ -503,7 +516,7 @@
+@@ -504,7 +517,7 @@
  #define SSB_CHIPCO_FLASHCTL_ST_PP	0x0302		/* Page Program */
  #define SSB_CHIPCO_FLASHCTL_ST_SE	0x02D8		/* Sector Erase */
  #define SSB_CHIPCO_FLASHCTL_ST_BE	0x00C7		/* Bulk Erase */
@@ -485,7 +485,7 @@
  #define SSB_CHIPCO_FLASHCTL_ST_RES	0x03AB		/* Read Electronic Signature */
  #define SSB_CHIPCO_FLASHCTL_ST_CSA	0x1000		/* Keep chip select asserted */
  #define SSB_CHIPCO_FLASHCTL_ST_SSE	0x0220		/* Sub-sector Erase */
-@@ -594,6 +607,9 @@ struct ssb_chipcommon {
+@@ -595,6 +608,9 @@ struct ssb_chipcommon {
  	struct ssb_chipcommon_pmu pmu;
  	u32 ticks_per_ms;
  	u32 max_timer_ms;
diff --git a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
index 98cd795a5..977587969 100644
--- a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
+++ b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
@@ -292,7 +292,7 @@
  	u32 id, id2;
  
  	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
-@@ -150,6 +375,12 @@ int bcma_sflash_init(struct bcma_drv_cc
+@@ -150,6 +375,12 @@ int bcma_sflash_init(struct bcma_drv_cc 
  	sflash->numblocks = e->numblocks;
  	sflash->size = sflash->blocksize * sflash->numblocks;
  	sflash->present = true;
@@ -316,7 +316,7 @@
  /** ChipCommon core registers. **/
  #define BCMA_CC_ID			0x0000
  #define  BCMA_CC_ID_ID			0x0000FFFF
-@@ -519,17 +521,6 @@ struct bcma_pflash {
+@@ -520,17 +522,6 @@ struct bcma_pflash {
  	u32 window_size;
  };
  
@@ -334,7 +334,7 @@
  
  #ifdef CONFIG_BCMA_NFLASH
  struct mtd_info;
-@@ -564,7 +555,7 @@ struct bcma_drv_cc {
+@@ -565,7 +556,7 @@ struct bcma_drv_cc {
  #ifdef CONFIG_BCMA_DRIVER_MIPS
  	struct bcma_pflash pflash;
  #ifdef CONFIG_BCMA_SFLASH
diff --git a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch
index 7a2129823..60f27d9ea 100644
--- a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch
+++ b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch
@@ -25,7 +25,7 @@
  	.num_resources	= 0,
  };
  
-@@ -31,6 +38,11 @@ int bcma_nflash_init(struct bcma_drv_cc
+@@ -31,6 +38,11 @@ int bcma_nflash_init(struct bcma_drv_cc 
  		return -ENODEV;
  	}
  
@@ -37,7 +37,7 @@
  	cc->nflash.present = true;
  	if (cc->core->id.rev == 38 &&
  	    (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT))
-@@ -42,3 +54,141 @@ int bcma_nflash_init(struct bcma_drv_cc
+@@ -42,3 +54,141 @@ int bcma_nflash_init(struct bcma_drv_cc 
  
  	return 0;
  }
@@ -189,7 +189,7 @@
  
  /** ChipCommon core registers. **/
  #define BCMA_CC_ID			0x0000
-@@ -522,17 +523,6 @@ struct bcma_pflash {
+@@ -523,17 +524,6 @@ struct bcma_pflash {
  };
  
  
@@ -207,7 +207,7 @@
  struct bcma_serial_port {
  	void *regs;
  	unsigned long clockspeed;
-@@ -558,7 +548,7 @@ struct bcma_drv_cc {
+@@ -559,7 +549,7 @@ struct bcma_drv_cc {
  	struct bcm47xx_sflash sflash;
  #endif
  #ifdef CONFIG_BCMA_NFLASH
@@ -216,7 +216,7 @@
  #endif
  
  	int nr_serial_ports;
-@@ -625,4 +615,13 @@ extern void bcma_chipco_regctl_maskset(s
+@@ -628,4 +618,13 @@ extern void bcma_chipco_regctl_maskset(s
  				       u32 offset, u32 mask, u32 set);
  extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid);
  
diff --git a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
index d06eb8f0a..073ac4205 100644
--- a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
+++ b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
@@ -10,7 +10,7 @@
  #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
 --- a/drivers/bcma/driver_chipcommon.c
 +++ b/drivers/bcma/driver_chipcommon.c
-@@ -329,7 +329,7 @@ void bcma_chipco_serial_init(struct bcma
+@@ -332,7 +332,7 @@ void bcma_chipco_serial_init(struct bcma
  		return;
  	}
  
@@ -65,7 +65,7 @@
  	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
  
  	return 0;
-@@ -596,6 +596,6 @@ int bcma_core_pci_pcibios_map_irq(const
+@@ -596,6 +596,6 @@ int bcma_core_pci_pcibios_map_irq(const 
  
  	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
  			       pci_ops);
diff --git a/target/linux/brcm47xx/patches-3.6/750-bgmac.patch b/target/linux/brcm47xx/patches-3.6/750-bgmac.patch
index b8fd0bae2..989a3f28e 100644
--- a/target/linux/brcm47xx/patches-3.6/750-bgmac.patch
+++ b/target/linux/brcm47xx/patches-3.6/750-bgmac.patch
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/bcma/driver_chipcommon_pmu.c
 +++ b/drivers/bcma/driver_chipcommon_pmu.c
-@@ -264,7 +264,7 @@ static u32 bcma_pmu_pll_clock_bcm4706(st
+@@ -280,7 +280,7 @@ static u32 bcma_pmu_pll_clock_bcm4706(st
  }
  
  /* query bus clock frequency for PMU-enabled chipcommon */
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
  	struct bcma_bus *bus = cc->core->bus;
  
-@@ -293,6 +293,7 @@ static u32 bcma_pmu_get_bus_clock(struct
+@@ -309,6 +309,7 @@ static u32 bcma_pmu_get_bus_clock(struct
  	}
  	return BCMA_CC_PMU_HT_CLOCK;
  }
@@ -1969,7 +1969,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +#endif /* _BGMAC_H */
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -624,4 +624,6 @@ int bcma_nflash_erase(struct bcma_drv_cc
+@@ -627,4 +627,6 @@ int bcma_nflash_erase(struct bcma_drv_cc
  int bcma_nflash_commit(struct bcma_drv_cc *cc, u32 offset, u32 len, const u8 *buf);
  #endif