kernel: update bcma and ssb for kernel 3.8+ to version from wireless-testing master-2013-04-26.

SVN-Revision: 36473

8 files changed, 7 insertions, 115 deletions

diff --git a/target/linux/brcm47xx/patches-3.8/030-mtd-bcm47xxsflash-add-own-struct-for-abstrating-bus-.patch b/target/linux/brcm47xx/patches-3.8/030-mtd-bcm47xxsflash-add-own-struct-for-abstrating-bus-.patch
index 1f3eea8526..2d2f11bf34 100644
--- a/target/linux/brcm47xx/patches-3.8/030-mtd-bcm47xxsflash-add-own-struct-for-abstrating-bus-.patch
+++ b/target/linux/brcm47xx/patches-3.8/030-mtd-bcm47xxsflash-add-own-struct-for-abstrating-bus-.patch
@@ -113,8 +113,8 @@
 +#endif /* BCM47XXSFLASH */
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -529,6 +529,7 @@ struct bcma_sflash {
- 	u32 size;
+@@ -544,6 +544,7 @@ struct bcma_nflash {
+ 	bool boot;		/* This is the flash the SoC boots from */
  
  	struct mtd_info *mtd;
 +	void *priv;
diff --git a/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch b/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
index 6c17fb90a9..1148a489db 100644
--- a/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
+++ b/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
@@ -296,7 +296,7 @@
  }
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -549,6 +549,15 @@ static int ssb_devices_register(struct s
+@@ -545,6 +545,15 @@ static int ssb_devices_register(struct s
  		dev_idx++;
  	}
  
@@ -314,7 +314,7 @@
  		err = platform_device_register(&ssb_pflash_dev);
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
-@@ -220,6 +220,7 @@ extern u32 ssb_chipco_watchdog_timer_set
+@@ -231,6 +231,7 @@ extern u32 ssb_chipco_watchdog_timer_set
  /* driver_chipcommon_sflash.c */
  #ifdef CONFIG_SSB_SFLASH
  int ssb_sflash_init(struct ssb_chipcommon *cc);
diff --git a/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch b/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
index 0bd23cc714..bba2b69e46 100644
--- a/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
+++ b/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
@@ -269,7 +269,7 @@
  
  /** ChipCommon core registers. **/
  #define BCMA_CC_ID			0x0000
-@@ -520,19 +521,6 @@ struct bcma_pflash {
+@@ -523,19 +524,6 @@ struct bcma_pflash {
  	u32 window_size;
  };
  
@@ -289,7 +289,7 @@
  #ifdef CONFIG_BCMA_NFLASH
  struct mtd_info;
  
-@@ -566,7 +554,7 @@ struct bcma_drv_cc {
+@@ -570,7 +558,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.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch b/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
index 04c378f33e..4606c2310f 100644
--- a/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
+++ b/target/linux/brcm47xx/patches-3.8/080-MIPS-BCM47XX-rewrite-nvram-probing.patch
@@ -450,23 +450,3 @@
  			crystalfreq = simple_strtoul(buf, NULL, 0);
  #endif
  	}
---- a/include/linux/ssb/ssb_driver_gige.h
-+++ b/include/linux/ssb/ssb_driver_gige.h
-@@ -98,14 +98,14 @@ static inline bool ssb_gige_must_flush_p
- }
- 
- #ifdef CONFIG_BCM47XX
--#include <asm/mach-bcm47xx/nvram.h>
-+#include <bcm47xx_nvram.h>
- /* Get the device MAC address */
- static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
- {
- 	char buf[20];
--	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
-+	if (bcm47xx_nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
- 		return;
--	nvram_parse_macaddr(buf, macaddr);
-+	bcm47xx_nvram_parse_macaddr(buf, macaddr);
- }
- #else
- static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
diff --git a/target/linux/brcm47xx/patches-3.8/270-ssb-fix-unaligned-access-to-mac-address.patch b/target/linux/brcm47xx/patches-3.8/270-ssb-fix-unaligned-access-to-mac-address.patch
deleted file mode 100644
index 0a4dd62487..0000000000
--- a/target/linux/brcm47xx/patches-3.8/270-ssb-fix-unaligned-access-to-mac-address.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -26,6 +26,7 @@ struct ssb_sprom_core_pwr_info {
- 
- struct ssb_sprom {
- 	u8 revision;
-+	u8 country_code;	/* Country Code */
- 	u8 il0mac[6];		/* MAC address for 802.11b/g */
- 	u8 et0mac[6];		/* MAC address for Ethernet */
- 	u8 et1mac[6];		/* MAC address for 802.11a */
-@@ -36,7 +37,6 @@ struct ssb_sprom {
- 	u16 board_rev;		/* Board revision number from SPROM. */
- 	u16 board_num;		/* Board number from SPROM. */
- 	u16 board_type;		/* Board type from SPROM. */
--	u8 country_code;	/* Country Code */
- 	char alpha2[2];		/* Country Code as two chars like EU or US */
- 	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
- 	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
diff --git a/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
index cdbae5f872..fc868c00da 100644
--- a/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
@@ -343,45 +343,3 @@
  #define PCI_DEVICE_ID_TIGON3_5751	0x1677
  #define PCI_DEVICE_ID_TIGON3_5715	0x1678
  #define PCI_DEVICE_ID_TIGON3_5715S	0x1679
---- a/include/linux/ssb/ssb_driver_gige.h
-+++ b/include/linux/ssb/ssb_driver_gige.h
-@@ -97,21 +97,16 @@ static inline bool ssb_gige_must_flush_p
- 	return 0;
- }
- 
--#ifdef CONFIG_BCM47XX
--#include <bcm47xx_nvram.h>
- /* Get the device MAC address */
--static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
--{
--	char buf[20];
--	if (bcm47xx_nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
--		return;
--	bcm47xx_nvram_parse_macaddr(buf, macaddr);
--}
--#else
--static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
-+static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
- {
-+	struct ssb_gige *dev = pdev_to_ssb_gige(pdev);
-+	if (!dev)
-+		return -ENODEV;
-+
-+	memcpy(macaddr, dev->dev->bus->sprom.et0mac, 6);
-+	return 0;
- }
--#endif
- 
- extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
- 					  struct pci_dev *pdev);
-@@ -175,6 +170,10 @@ static inline bool ssb_gige_must_flush_p
- {
- 	return 0;
- }
-+static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
-+{
-+	return -ENODEV;
-+}
- 
- #endif /* CONFIG_SSB_DRIVER_GIGE */
- #endif /* LINUX_SSB_DRIVER_GIGE_H_ */
diff --git a/target/linux/brcm47xx/patches-3.8/750-bgmac.patch b/target/linux/brcm47xx/patches-3.8/750-bgmac.patch
index 1c31d4c16e..30f32f9514 100644
--- a/target/linux/brcm47xx/patches-3.8/750-bgmac.patch
+++ b/target/linux/brcm47xx/patches-3.8/750-bgmac.patch
@@ -41,25 +41,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  create mode 100644 drivers/net/ethernet/broadcom/bgmac.c
  create mode 100644 drivers/net/ethernet/broadcom/bgmac.h
 
---- a/drivers/bcma/driver_chipcommon_pmu.c
-+++ b/drivers/bcma/driver_chipcommon_pmu.c
-@@ -280,7 +280,7 @@ static u32 bcma_pmu_pll_clock_bcm4706(st
- }
- 
- /* query bus clock frequency for PMU-enabled chipcommon */
--static u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc)
-+u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc)
- {
- 	struct bcma_bus *bus = cc->core->bus;
- 
-@@ -309,6 +309,7 @@ static u32 bcma_pmu_get_bus_clock(struct
- 	}
- 	return BCMA_CC_PMU_HT_CLOCK;
- }
-+EXPORT_SYMBOL_GPL(bcma_pmu_get_bus_clock);
- 
- /* query cpu clock frequency for PMU-enabled chipcommon */
- u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc)
 --- a/drivers/net/ethernet/broadcom/Kconfig
 +++ b/drivers/net/ethernet/broadcom/Kconfig
 @@ -121,4 +121,13 @@ config BNX2X
@@ -1967,12 +1948,3 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +void bgmac_phy_write(struct bgmac *bgmac, u8 phyaddr, u8 reg, u16 value);
 +
 +#endif /* _BGMAC_H */
---- a/include/linux/bcma/bcma_driver_chipcommon.h
-+++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -626,4 +626,6 @@ 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);
- 
-+extern u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc);
-+
- #endif /* LINUX_BCMA_DRIVER_CC_H_ */
diff --git a/target/linux/brcm47xx/patches-3.8/976-ssb_increase_pci_delay.patch b/target/linux/brcm47xx/patches-3.8/976-ssb_increase_pci_delay.patch
index 0dc2d5f635..b56f1d5be3 100644
--- a/target/linux/brcm47xx/patches-3.8/976-ssb_increase_pci_delay.patch
+++ b/target/linux/brcm47xx/patches-3.8/976-ssb_increase_pci_delay.patch
@@ -1,6 +1,6 @@
 --- a/drivers/ssb/driver_pcicore.c
 +++ b/drivers/ssb/driver_pcicore.c
-@@ -376,7 +376,7 @@ static void ssb_pcicore_init_hostmode(st
+@@ -375,7 +375,7 @@ static void ssb_pcicore_init_hostmode(st
  	set_io_port_base(ssb_pcicore_controller.io_map_base);
  	/* Give some time to the PCI controller to configure itself with the new
  	 * values. Not waiting at this point causes crashes of the machine. */