kernel: update bcma and ssb to version master-2014-07-22

This is a backport of bcma and ssb from wireless-tesing/master tag
master-2014-07-22.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41804

8 files changed, 13 insertions, 13 deletions

diff --git a/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch b/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch
index fe44827..b15c012 100644
--- a/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch
+++ b/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch
@@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +#endif /* CONFIG_OF */
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -319,6 +319,8 @@ struct bcma_bus {
+@@ -322,6 +322,8 @@ struct bcma_bus {
  		struct pci_dev *host_pci;
  		/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
  		struct sdio_func *host_sdio;
diff --git a/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch b/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch
index 76641d8..7c6cbbd 100644
--- a/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch
+++ b/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch
@@ -57,7 +57,7 @@ Subject: [PATCH 7/8] bcma: get irqs from dt
  static int bcma_register_cores(struct bcma_bus *bus)
  {
  	struct bcma_device *core;
-@@ -145,7 +179,13 @@ static int bcma_register_cores(struct bc
+@@ -146,7 +180,13 @@ static int bcma_register_cores(struct bc
  			break;
  		case BCMA_HOSTTYPE_SOC:
  			core->dev.dma_mask = &core->dev.coherent_dma_mask;
diff --git a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
index d885c5c..5b4a79e 100644
--- a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
+++ b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
@@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +#endif /* CONFIG_OF */
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -319,6 +319,8 @@ struct bcma_bus {
+@@ -322,6 +322,8 @@ struct bcma_bus {
  		struct pci_dev *host_pci;
  		/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
  		struct sdio_func *host_sdio;
diff --git a/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch b/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
index 28ad8d5..f81541f 100644
--- a/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
+++ b/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
@@ -59,7 +59,7 @@ with the irq number and add it to the core configuration.
  static int bcma_register_cores(struct bcma_bus *bus)
  {
  	struct bcma_device *core;
-@@ -154,7 +188,13 @@ static int bcma_register_cores(struct bc
+@@ -155,7 +189,13 @@ static int bcma_register_cores(struct bc
  			break;
  		case BCMA_HOSTTYPE_SOC:
  			core->dev.dma_mask = &core->dev.coherent_dma_mask;
diff --git a/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch b/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch
index e071641..a10542e 100644
--- a/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch
+++ b/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch
@@ -70,7 +70,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus,
  					 struct ssb_sprom *out)
  {
-@@ -553,7 +595,14 @@ int bcma_sprom_get(struct bcma_bus *bus)
+@@ -579,7 +621,14 @@ int bcma_sprom_get(struct bcma_bus *bus)
  	u16 *sprom;
  	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4,
  				 SSB_SPROMSIZE_WORDS_R10, };
diff --git a/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch b/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch
index 7a011ca..6562f72 100644
--- a/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch
+++ b/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch
@@ -60,7 +60,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  		ohci_addr = 0x18009000;
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -263,7 +263,7 @@ struct bcma_device {
+@@ -266,7 +266,7 @@ struct bcma_device {
  	u8 core_unit;
  
  	u32 addr;
diff --git a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
index 9fdf66a..dd4d284 100644
--- a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
+++ b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
@@ -112,8 +112,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +		case BCMA_CORE_CHIPCOMMON_B:
  		case BCMA_CORE_PCI:
  		case BCMA_CORE_PCIE:
- 		case BCMA_CORE_MIPS_74K:
-@@ -300,6 +301,13 @@ int bcma_bus_register(struct bcma_bus *b
+ 		case BCMA_CORE_PCIE2:
+@@ -301,6 +302,13 @@ int bcma_bus_register(struct bcma_bus *b
  		bcma_core_chipcommon_init(&bus->drv_cc);
  	}
  
@@ -127,7 +127,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  	/* Init MIPS core */
  	core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
  	if (core) {
-@@ -347,6 +355,8 @@ void bcma_bus_unregister(struct bcma_bus
+@@ -355,6 +363,8 @@ void bcma_bus_unregister(struct bcma_bus
  	else if (err)
  		bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
  
@@ -148,14 +148,14 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  		default:
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -334,6 +334,7 @@ struct bcma_bus {
+@@ -337,6 +337,7 @@ struct bcma_bus {
  	u8 num;
  
  	struct bcma_drv_cc drv_cc;
 +	struct bcma_drv_cc_b drv_cc_b;
  	struct bcma_drv_pci drv_pci[2];
+ 	struct bcma_drv_pcie2 drv_pcie2;
  	struct bcma_drv_mips drv_mips;
- 	struct bcma_drv_gmac_cmn drv_gmac_cmn;
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
 @@ -644,6 +644,12 @@ struct bcma_drv_cc {
diff --git a/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch b/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch
index c87bdd7..830ae5e 100644
--- a/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch
+++ b/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch
@@ -13,9 +13,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/bcma/host_pci.c
 +++ b/drivers/bcma/host_pci.c
-@@ -280,6 +280,8 @@ static const struct pci_device_id bcma_p
- 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
+@@ -281,6 +281,8 @@ static const struct pci_device_id bcma_p
  	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
 +	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },
 +	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4360) },