kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31278 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-13 19:35:40 +00:00 · 2012-04-13 19:35:40 +00:00 · 5af062a0e0
parent 53e32542e1
commit 5af062a0e0
50 changed files with 19944 additions and 4722 deletions
--- a/package/mac80211/patches/880-brcmsmac_suspend_signature.patch
+++ b/package/mac80211/patches/880-brcmsmac_suspend_signature.patch
@ -1,13 +0,0 @@
 Remove this patch when we get a new version of bcma into our kernel.
 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1129,7 +1129,7 @@ static int __devinit brcms_bcma_probe(st
 	return 0;
 }
 -static int brcms_suspend(struct bcma_device *pdev)
 +static int brcms_suspend(struct bcma_device *pdev, pm_message_t state)
 {
 	struct brcms_info *wl;
 	struct ieee80211_hw *hw;
--- a/package/mac80211/patches/890-b43legay-antenna-gain.patch
+++ b/package/mac80211/patches/890-b43legay-antenna-gain.patch
@ -0,0 +1,11 @@
 --- a/drivers/net/wireless/b43legacy/phy.c
 +++ b/drivers/net/wireless/b43legacy/phy.c
@@ -1860,7 +1860,7 @@ void b43legacy_phy_xmitpower(struct b43l
 	 * which accounts for the factor of 4 */
 #define REG_MAX_PWR 20
 	max_pwr = min(REG_MAX_PWR * 4
 -		      - dev->dev->bus->sprom.antenna_gain.ghz24.a0
 +		      - dev->dev->bus->sprom.antenna_gain.a0
 		      - 0x6, max_pwr);
 	/* find the desired power in Q5.2 - power_level is in dBm
--- a/target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch
+++ b/target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch
@ -22,7 +22,7 @@
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -108,10 +108,68 @@
+@@ -117,10 +117,68 @@
 #define  BCMA_CC_JCTL_EXT_EN		2		/* Enable external targets */
 #define  BCMA_CC_JCTL_EN		1		/* Enable Jtag master */
 #define BCMA_CC_FLASHCTL		0x0040
@ -91,7 +91,7 @@
 #define BCMA_CC_BCAST_ADDR		0x0050
 #define BCMA_CC_BCAST_DATA		0x0054
 #define BCMA_CC_GPIOPULLUP		0x0058		/* Rev >= 20 only */
-@@ -300,6 +358,12 @@
+@@ -324,6 +382,12 @@
 #define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4	BIT(16)	/* enable bt_shd0 at gpio4 */
 #define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5	BIT(17)	/* enable bt_shd1 at gpio5 */
@ -104,7 +104,7 @@
 /* Data for the PMU, if available.
  * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
  */
-@@ -309,6 +373,10 @@ struct bcma_chipcommon_pmu {
+@@ -333,6 +397,10 @@ struct bcma_chipcommon_pmu {
 };
 #ifdef CONFIG_BCMA_DRIVER_MIPS
@ -115,7 +115,7 @@
 struct bcma_pflash {
 	u8 buswidth;
 	u32 window;
-@@ -334,7 +402,10 @@ struct bcma_drv_cc {
+@@ -358,7 +426,10 @@ struct bcma_drv_cc {
 	u16 fast_pwrup_delay;
 	struct bcma_chipcommon_pmu pmu;
 #ifdef CONFIG_BCMA_DRIVER_MIPS
--- a/target/linux/brcm47xx/patches-3.2/021-bcma-add-serial-flash-support-to-bcma.patch
+++ b/target/linux/brcm47xx/patches-3.2/021-bcma-add-serial-flash-support-to-bcma.patch
@ -23,7 +23,7 @@
 bcma-$(CONFIG_BCMA_DRIVER_MIPS)		+= driver_mips.o
 --- a/drivers/bcma/bcma_private.h
 +++ b/drivers/bcma/bcma_private.h
-@@ -41,6 +41,11 @@ void bcma_chipco_serial_init(struct bcma
+@@ -42,6 +42,11 @@ void bcma_chipco_serial_init(struct bcma
 u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc);
 u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc);
@ -455,7 +455,7 @@
 		pr_info("found parallel flash.\n");
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -375,6 +375,7 @@ struct bcma_chipcommon_pmu {
+@@ -399,6 +399,7 @@ struct bcma_chipcommon_pmu {
 #ifdef CONFIG_BCMA_DRIVER_MIPS
 enum bcma_flash_type {
 	BCMA_PFLASH,
@ -463,7 +463,7 @@
 };
 struct bcma_pflash {
-@@ -383,6 +384,14 @@ struct bcma_pflash {
+@@ -407,6 +408,14 @@ struct bcma_pflash {
 	u32 window_size;
 };
@ -478,7 +478,7 @@
 struct bcma_serial_port {
 	void *regs;
 	unsigned long clockspeed;
-@@ -405,6 +414,9 @@ struct bcma_drv_cc {
+@@ -429,6 +438,9 @@ struct bcma_drv_cc {
 	enum bcma_flash_type flash_type;
 	union {
 		struct bcma_pflash pflash;
@ -488,7 +488,7 @@
 	};
 	int nr_serial_ports;
-@@ -459,4 +471,14 @@ extern void bcma_chipco_chipctl_maskset(
+@@ -483,4 +495,14 @@ extern void bcma_chipco_chipctl_maskset(
 extern void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc,
 				       u32 offset, u32 mask, u32 set);
--- a/target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch
+++ b/target/linux/brcm47xx/patches-3.2/030-bcm47xx-bcma-nandflash.patch
@ -239,7 +239,7 @@
 bcma-$(CONFIG_BCMA_DRIVER_MIPS)		+= driver_mips.o
 --- a/drivers/bcma/bcma_private.h
 +++ b/drivers/bcma/bcma_private.h
-@@ -46,6 +46,11 @@ u32 bcma_pmu_get_clockcpu(struct bcma_dr
+@@ -47,6 +47,11 @@ u32 bcma_pmu_get_clockcpu(struct bcma_dr
 int bcma_sflash_init(struct bcma_drv_cc *cc);
 #endif /* CONFIG_BCMA_SFLASH */
@ -971,7 +971,7 @@
 +MODULE_DESCRIPTION("BCM47XX NAND flash driver");
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -376,6 +376,7 @@ struct bcma_chipcommon_pmu {
+@@ -400,6 +400,7 @@ struct bcma_chipcommon_pmu {
 enum bcma_flash_type {
 	BCMA_PFLASH,
 	BCMA_SFLASH,
@ -979,7 +979,7 @@
 };
 struct bcma_pflash {
-@@ -392,6 +393,14 @@ struct bcma_sflash {
+@@ -416,6 +417,14 @@ struct bcma_sflash {
 };
 #endif /* CONFIG_BCMA_SFLASH */
@ -994,7 +994,7 @@
 struct bcma_serial_port {
 	void *regs;
 	unsigned long clockspeed;
-@@ -417,6 +426,9 @@ struct bcma_drv_cc {
+@@ -441,6 +450,9 @@ struct bcma_drv_cc {
 #ifdef CONFIG_BCMA_SFLASH
 		struct bcma_sflash sflash;
 #endif /* CONFIG_BCMA_SFLASH */
@ -1004,7 +1004,7 @@
 	};
 	int nr_serial_ports;
-@@ -481,4 +493,13 @@ int bcma_sflash_write(struct bcma_drv_cc
+@@ -505,4 +517,13 @@ int bcma_sflash_write(struct bcma_drv_cc
 int bcma_sflash_erase(struct bcma_drv_cc *cc, u32 offset);
 #endif /* CONFIG_BCMA_SFLASH */
--- a/target/linux/brcm47xx/patches-3.2/040-bcma-add-the-core-unit-number.patch
+++ b/target/linux/brcm47xx/patches-3.2/040-bcma-add-the-core-unit-number.patch
@ -1,61 +0,0 @@
 From 7b9116eeaf44c0d368b5eeaa06eb101465284596 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Wed, 11 Jan 2012 15:26:11 +0100
 Subject: [PATCH 23/31] bcma: add the core unit number
 Some SoCs have two pcie or gmac cores and we need to know the number of
 the specific core on the bus. This is the case for the BCM4706.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/bcma/scan.c       |   14 ++++++++++++++
 include/linux/bcma/bcma.h |    1 +
 2 files changed, 15 insertions(+), 0 deletions(-)
 --- a/drivers/bcma/scan.c
 +++ b/drivers/bcma/scan.c
@@ -212,6 +212,17 @@ static struct bcma_device *bcma_find_cor
 	return NULL;
 }
 +static struct bcma_device *bcma_find_core_reverse(struct bcma_bus *bus, u16 coreid)
 +{
 +	struct bcma_device *core;
 +
 +	list_for_each_entry_reverse(core, &bus->cores, list) {
 +		if (core->id.id == coreid)
 +			return core;
 +	}
 +	return NULL;
 +}
 +
 static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
 			      struct bcma_device_id *match, int core_num,
 			      struct bcma_device *core)
@@ -392,6 +403,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
 	bcma_scan_switch_core(bus, erombase);
 	while (eromptr < eromend) {
 +		struct bcma_device *other_core;
 		struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL);
 		if (!core)
 			return -ENOMEM;
@@ -411,6 +423,8 @@ int bcma_bus_scan(struct bcma_bus *bus)
 		core->core_index = core_num++;
 		bus->nr_cores++;
 +		other_core = bcma_find_core_reverse(bus, core->id.id);
 +		core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
 		pr_info("Core %d found: %s "
 			"(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
@@ -136,6 +136,7 @@ struct bcma_device {
 	bool dev_registered;
 	u8 core_index;
 +	u8 core_unit;
 	u32 addr;
 	u32 wrap;
--- a/target/linux/brcm47xx/patches-3.2/041-bcma-constants-for-PCI-and-use-them.patch
+++ b/target/linux/brcm47xx/patches-3.2/041-bcma-constants-for-PCI-and-use-them.patch
@ -1,334 +0,0 @@
 From 300efafa8e1381a208c723bb9d03d46bf29f1ec0 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sat, 14 Jan 2012 20:02:15 +0100
 Subject: [PATCH 24/31] bcma: constants for PCI and use them
 There are loots of magic numbers used in the PCIe code. These constants
 are from the Broadcom SDK and will also used in the host controller.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/bcma/driver_pci.c            |  124 +++++++++++++++++++---------------
 include/linux/bcma/bcma_driver_pci.h |   85 +++++++++++++++++++++++
 2 files changed, 155 insertions(+), 54 deletions(-)
 --- a/drivers/bcma/driver_pci.c
 +++ b/drivers/bcma/driver_pci.c
@@ -4,6 +4,7 @@
  *
  * Copyright 2005, Broadcom Corporation
  * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 + * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -18,38 +19,39 @@
 static u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address)
 {
 -	pcicore_write32(pc, 0x130, address);
 -	pcicore_read32(pc, 0x130);
 -	return pcicore_read32(pc, 0x134);
 +	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
 +	pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
 +	return pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_DATA);
 }
 #if 0
 static void bcma_pcie_write(struct bcma_drv_pci *pc, u32 address, u32 data)
 {
 -	pcicore_write32(pc, 0x130, address);
 -	pcicore_read32(pc, 0x130);
 -	pcicore_write32(pc, 0x134, data);
 +	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
 +	pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
 +	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_DATA, data);
 }
 #endif
 static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy)
 {
 -	const u16 mdio_control = 0x128;
 -	const u16 mdio_data = 0x12C;
 	u32 v;
 	int i;
 -	v = (1 << 30); /* Start of Transaction */
 -	v |= (1 << 28); /* Write Transaction */
 -	v |= (1 << 17); /* Turnaround */
 -	v |= (0x1F << 18);
 +	v = BCMA_CORE_PCI_MDIODATA_START;
 +	v |= BCMA_CORE_PCI_MDIODATA_WRITE;
 +	v |= (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
 +	      BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
 +	v |= (BCMA_CORE_PCI_MDIODATA_BLK_ADDR <<
 +	      BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
 +	v |= BCMA_CORE_PCI_MDIODATA_TA;
 	v |= (phy << 4);
 -	pcicore_write32(pc, mdio_data, v);
 +	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
 	udelay(10);
 	for (i = 0; i < 200; i++) {
 -		v = pcicore_read32(pc, mdio_control);
 -		if (v & 0x100 /* Trans complete */)
 +		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
 +		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)
 			break;
 		msleep(1);
 	}
@@ -57,79 +59,84 @@ static void bcma_pcie_mdio_set_phy(struc
 static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address)
 {
 -	const u16 mdio_control = 0x128;
 -	const u16 mdio_data = 0x12C;
 	int max_retries = 10;
 	u16 ret = 0;
 	u32 v;
 	int i;
 -	v = 0x80; /* Enable Preamble Sequence */
 -	v |= 0x2; /* MDIO Clock Divisor */
 -	pcicore_write32(pc, mdio_control, v);
 +	/* enable mdio access to SERDES */
 +	v = BCMA_CORE_PCI_MDIOCTL_PREAM_EN;
 +	v |= BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL;
 +	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, v);
 	if (pc->core->id.rev >= 10) {
 		max_retries = 200;
 		bcma_pcie_mdio_set_phy(pc, device);
 +		v = (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
 +		     BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
 +		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
 +	} else {
 +		v = (device << BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD);
 +		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
 	}
 -	v = (1 << 30); /* Start of Transaction */
 -	v |= (1 << 29); /* Read Transaction */
 -	v |= (1 << 17); /* Turnaround */
 -	if (pc->core->id.rev < 10)
 -		v |= (u32)device << 22;
 -	v |= (u32)address << 18;
 -	pcicore_write32(pc, mdio_data, v);
 +	v = BCMA_CORE_PCI_MDIODATA_START;
 +	v |= BCMA_CORE_PCI_MDIODATA_READ;
 +	v |= BCMA_CORE_PCI_MDIODATA_TA;
 +
 +	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
 	/* Wait for the device to complete the transaction */
 	udelay(10);
 	for (i = 0; i < max_retries; i++) {
 -		v = pcicore_read32(pc, mdio_control);
 -		if (v & 0x100 /* Trans complete */) {
 +		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
 +		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE) {
 			udelay(10);
 -			ret = pcicore_read32(pc, mdio_data);
 +			ret = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_DATA);
 			break;
 		}
 		msleep(1);
 	}
 -	pcicore_write32(pc, mdio_control, 0);
 +	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
 	return ret;
 }
 static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device,
 				u8 address, u16 data)
 {
 -	const u16 mdio_control = 0x128;
 -	const u16 mdio_data = 0x12C;
 	int max_retries = 10;
 	u32 v;
 	int i;
 -	v = 0x80; /* Enable Preamble Sequence */
 -	v |= 0x2; /* MDIO Clock Divisor */
 -	pcicore_write32(pc, mdio_control, v);
 +	/* enable mdio access to SERDES */
 +	v = BCMA_CORE_PCI_MDIOCTL_PREAM_EN;
 +	v |= BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL;
 +	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, v);
 	if (pc->core->id.rev >= 10) {
 		max_retries = 200;
 		bcma_pcie_mdio_set_phy(pc, device);
 +		v = (BCMA_CORE_PCI_MDIODATA_DEV_ADDR <<
 +		     BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF);
 +		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF);
 +	} else {
 +		v = (device << BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD);
 +		v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD);
 	}
 -	v = (1 << 30); /* Start of Transaction */
 -	v |= (1 << 28); /* Write Transaction */
 -	v |= (1 << 17); /* Turnaround */
 -	if (pc->core->id.rev < 10)
 -		v |= (u32)device << 22;
 -	v |= (u32)address << 18;
 +	v = BCMA_CORE_PCI_MDIODATA_START;
 +	v |= BCMA_CORE_PCI_MDIODATA_WRITE;
 +	v |= BCMA_CORE_PCI_MDIODATA_TA;
 	v |= data;
 -	pcicore_write32(pc, mdio_data, v);
 +	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_DATA, v);
 	/* Wait for the device to complete the transaction */
 	udelay(10);
 	for (i = 0; i < max_retries; i++) {
 -		v = pcicore_read32(pc, mdio_control);
 -		if (v & 0x100 /* Trans complete */)
 +		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);
 +		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)
 			break;
 		msleep(1);
 	}
 -	pcicore_write32(pc, mdio_control, 0);
 +	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);
 }
 /**************************************************
@@ -138,20 +145,29 @@ static void bcma_pcie_mdio_write(struct
 static u8 bcma_pcicore_polarity_workaround(struct bcma_drv_pci *pc)
 {
 -	return (bcma_pcie_read(pc, 0x204) & 0x10) ? 0xC0 : 0x80;
 +	u32 tmp;
 +	
 +	tmp = bcma_pcie_read(pc, BCMA_CORE_PCI_PLP_STATUSREG);
 +	if (tmp & BCMA_CORE_PCI_PLP_POLARITYINV_STAT)
 +		return BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE |
 +		       BCMA_CORE_PCI_SERDES_RX_CTRL_POLARITY;
 +	else
 +		return BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE;
 }
 static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc)
 {
 -	const u8 serdes_pll_device = 0x1D;
 -	const u8 serdes_rx_device = 0x1F;
 	u16 tmp;
 -	bcma_pcie_mdio_write(pc, serdes_rx_device, 1 /* Control */,
 -			      bcma_pcicore_polarity_workaround(pc));
 -	tmp = bcma_pcie_mdio_read(pc, serdes_pll_device, 1 /* Control */);
 -	if (tmp & 0x4000)
 -		bcma_pcie_mdio_write(pc, serdes_pll_device, 1, tmp & ~0x4000);
 +	bcma_pcie_mdio_write(pc, BCMA_CORE_PCI_MDIODATA_DEV_RX,
 +	                     BCMA_CORE_PCI_SERDES_RX_CTRL,
 +			     bcma_pcicore_polarity_workaround(pc));
 +	tmp = bcma_pcie_mdio_read(pc, BCMA_CORE_PCI_MDIODATA_DEV_PLL,
 +	                          BCMA_CORE_PCI_SERDES_PLL_CTRL);
 +	if (tmp & BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN)
 +		bcma_pcie_mdio_write(pc, BCMA_CORE_PCI_MDIODATA_DEV_PLL,
 +		                     BCMA_CORE_PCI_SERDES_PLL_CTRL,
 +		                     tmp & ~BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN);
 }
 /**************************************************
 --- a/include/linux/bcma/bcma_driver_pci.h
 +++ b/include/linux/bcma/bcma_driver_pci.h
@@ -53,6 +53,35 @@ struct pci_dev;
 #define  BCMA_CORE_PCI_SBTOPCI1_MASK		0xFC000000
 #define BCMA_CORE_PCI_SBTOPCI2			0x0108	/* Backplane to PCI translation 2 (sbtopci2) */
 #define  BCMA_CORE_PCI_SBTOPCI2_MASK		0xC0000000
 +#define BCMA_CORE_PCI_CONFIG_ADDR		0x0120	/* pcie config space access */
 +#define BCMA_CORE_PCI_CONFIG_DATA		0x0124	/* pcie config space access */
 +#define BCMA_CORE_PCI_MDIO_CONTROL		0x0128	/* controls the mdio access */
 +#define  BCMA_CORE_PCI_MDIOCTL_DIVISOR_MASK	0x7f	/* clock to be used on MDIO */
 +#define  BCMA_CORE_PCI_MDIOCTL_DIVISOR_VAL	0x2
 +#define  BCMA_CORE_PCI_MDIOCTL_PREAM_EN		0x80	/* Enable preamble sequnce */
 +#define  BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE	0x100	/* Tranaction complete */
 +#define BCMA_CORE_PCI_MDIO_DATA			0x012c	/* Data to the mdio access */
 +#define  BCMA_CORE_PCI_MDIODATA_MASK		0x0000ffff /* data 2 bytes */
 +#define  BCMA_CORE_PCI_MDIODATA_TA		0x00020000 /* Turnaround */
 +#define  BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD	18	/* Regaddr shift (rev < 10) */
 +#define  BCMA_CORE_PCI_MDIODATA_REGADDR_MASK_OLD	0x003c0000 /* Regaddr Mask (rev < 10) */
 +#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF_OLD	22	/* Physmedia devaddr shift (rev < 10) */
 +#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_MASK_OLD	0x0fc00000 /* Physmedia devaddr Mask (rev < 10) */
 +#define  BCMA_CORE_PCI_MDIODATA_REGADDR_SHF	18	/* Regaddr shift */
 +#define  BCMA_CORE_PCI_MDIODATA_REGADDR_MASK	0x007c0000 /* Regaddr Mask */
 +#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_SHF	23	/* Physmedia devaddr shift */
 +#define  BCMA_CORE_PCI_MDIODATA_DEVADDR_MASK	0x0f800000 /* Physmedia devaddr Mask */
 +#define  BCMA_CORE_PCI_MDIODATA_WRITE		0x10000000 /* write Transaction */
 +#define  BCMA_CORE_PCI_MDIODATA_READ		0x20000000 /* Read Transaction */
 +#define  BCMA_CORE_PCI_MDIODATA_START		0x40000000 /* start of Transaction */
 +#define  BCMA_CORE_PCI_MDIODATA_DEV_ADDR	0x0	/* dev address for serdes */
 +#define  BCMA_CORE_PCI_MDIODATA_BLK_ADDR	0x1F	/* blk address for serdes */
 +#define  BCMA_CORE_PCI_MDIODATA_DEV_PLL		0x1d	/* SERDES PLL Dev */
 +#define  BCMA_CORE_PCI_MDIODATA_DEV_TX		0x1e	/* SERDES TX Dev */
 +#define  BCMA_CORE_PCI_MDIODATA_DEV_RX		0x1f	/* SERDES RX Dev */
 +#define BCMA_CORE_PCI_PCIEIND_ADDR		0x0130	/* indirect access to the internal register */
 +#define BCMA_CORE_PCI_PCIEIND_DATA		0x0134	/* Data to/from the internal regsiter */
 +#define BCMA_CORE_PCI_CLKREQENCTRL		0x0138	/*  >= rev 6, Clkreq rdma control */
 #define BCMA_CORE_PCI_PCICFG0			0x0400	/* PCI config space 0 (rev >= 8) */
 #define BCMA_CORE_PCI_PCICFG1			0x0500	/* PCI config space 1 (rev >= 8) */
 #define BCMA_CORE_PCI_PCICFG2			0x0600	/* PCI config space 2 (rev >= 8) */
@@ -72,6 +101,62 @@ struct pci_dev;
 #define  BCMA_CORE_PCI_SBTOPCI_RC_READL		0x00000010 /* Memory read line */
 #define  BCMA_CORE_PCI_SBTOPCI_RC_READM		0x00000020 /* Memory read multiple */
 +/* PCIE protocol PHY diagnostic registers */
 +#define BCMA_CORE_PCI_PLP_MODEREG		0x200	/* Mode */
 +#define BCMA_CORE_PCI_PLP_STATUSREG		0x204	/* Status */
 +#define  BCMA_CORE_PCI_PLP_POLARITYINV_STAT	0x10	/* Status reg PCIE_PLP_STATUSREG */
 +#define BCMA_CORE_PCI_PLP_LTSSMCTRLREG		0x208	/* LTSSM control */
 +#define BCMA_CORE_PCI_PLP_LTLINKNUMREG		0x20c	/* Link Training Link number */
 +#define BCMA_CORE_PCI_PLP_LTLANENUMREG		0x210	/* Link Training Lane number */
 +#define BCMA_CORE_PCI_PLP_LTNFTSREG		0x214	/* Link Training N_FTS */
 +#define BCMA_CORE_PCI_PLP_ATTNREG		0x218	/* Attention */
 +#define BCMA_CORE_PCI_PLP_ATTNMASKREG		0x21C	/* Attention Mask */
 +#define BCMA_CORE_PCI_PLP_RXERRCTR		0x220	/* Rx Error */
 +#define BCMA_CORE_PCI_PLP_RXFRMERRCTR		0x224	/* Rx Framing Error */
 +#define BCMA_CORE_PCI_PLP_RXERRTHRESHREG	0x228	/* Rx Error threshold */
 +#define BCMA_CORE_PCI_PLP_TESTCTRLREG		0x22C	/* Test Control reg */
 +#define BCMA_CORE_PCI_PLP_SERDESCTRLOVRDREG	0x230	/* SERDES Control Override */
 +#define BCMA_CORE_PCI_PLP_TIMINGOVRDREG		0x234	/* Timing param override */
 +#define BCMA_CORE_PCI_PLP_RXTXSMDIAGREG		0x238	/* RXTX State Machine Diag */
 +#define BCMA_CORE_PCI_PLP_LTSSMDIAGREG		0x23C	/* LTSSM State Machine Diag */
 +
 +/* PCIE protocol DLLP diagnostic registers */
 +#define BCMA_CORE_PCI_DLLP_LCREG		0x100	/* Link Control */
 +#define BCMA_CORE_PCI_DLLP_LSREG		0x104	/* Link Status */
 +#define BCMA_CORE_PCI_DLLP_LAREG		0x108	/* Link Attention */
 +#define  BCMA_CORE_PCI_DLLP_LSREG_LINKUP	(1 << 16)
 +#define BCMA_CORE_PCI_DLLP_LAMASKREG		0x10C	/* Link Attention Mask */
 +#define BCMA_CORE_PCI_DLLP_NEXTTXSEQNUMREG	0x110	/* Next Tx Seq Num */
 +#define BCMA_CORE_PCI_DLLP_ACKEDTXSEQNUMREG	0x114	/* Acked Tx Seq Num */
 +#define BCMA_CORE_PCI_DLLP_PURGEDTXSEQNUMREG	0x118	/* Purged Tx Seq Num */
 +#define BCMA_CORE_PCI_DLLP_RXSEQNUMREG		0x11C	/* Rx Sequence Number */
 +#define BCMA_CORE_PCI_DLLP_LRREG		0x120	/* Link Replay */
 +#define BCMA_CORE_PCI_DLLP_LACKTOREG		0x124	/* Link Ack Timeout */
 +#define BCMA_CORE_PCI_DLLP_PMTHRESHREG		0x128	/* Power Management Threshold */
 +#define BCMA_CORE_PCI_DLLP_RTRYWPREG		0x12C	/* Retry buffer write ptr */
 +#define BCMA_CORE_PCI_DLLP_RTRYRPREG		0x130	/* Retry buffer Read ptr */
 +#define BCMA_CORE_PCI_DLLP_RTRYPPREG		0x134	/* Retry buffer Purged ptr */
 +#define BCMA_CORE_PCI_DLLP_RTRRWREG		0x138	/* Retry buffer Read/Write */
 +#define BCMA_CORE_PCI_DLLP_ECTHRESHREG		0x13C	/* Error Count Threshold */
 +#define BCMA_CORE_PCI_DLLP_TLPERRCTRREG		0x140	/* TLP Error Counter */
 +#define BCMA_CORE_PCI_DLLP_ERRCTRREG		0x144	/* Error Counter */
 +#define BCMA_CORE_PCI_DLLP_NAKRXCTRREG		0x148	/* NAK Received Counter */
 +#define BCMA_CORE_PCI_DLLP_TESTREG		0x14C	/* Test */
 +#define BCMA_CORE_PCI_DLLP_PKTBIST		0x150	/* Packet BIST */
 +#define BCMA_CORE_PCI_DLLP_PCIE11		0x154	/* DLLP PCIE 1.1 reg */
 +
 +/* SERDES RX registers */
 +#define BCMA_CORE_PCI_SERDES_RX_CTRL		1	/* Rx cntrl */
 +#define  BCMA_CORE_PCI_SERDES_RX_CTRL_FORCE	0x80	/* rxpolarity_force */
 +#define  BCMA_CORE_PCI_SERDES_RX_CTRL_POLARITY	0x40	/* rxpolarity_value */
 +#define BCMA_CORE_PCI_SERDES_RX_TIMER1		2	/* Rx Timer1 */
 +#define BCMA_CORE_PCI_SERDES_RX_CDR		6	/* CDR */
 +#define BCMA_CORE_PCI_SERDES_RX_CDRBW		7	/* CDR BW */
 +
 +/* SERDES PLL registers */
 +#define BCMA_CORE_PCI_SERDES_PLL_CTRL		1	/* PLL control reg */
 +#define BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN	0x4000	/* bit 14 is FREQDET on */
 +
 /* PCIcore specific boardflags */
 #define BCMA_CORE_PCI_BFL_NOPCI			0x00000400 /* Board leaves PCI floating */
--- a/target/linux/brcm47xx/patches-3.2/042-bcma-export-bcma_pcie_read.patch
+++ b/target/linux/brcm47xx/patches-3.2/042-bcma-export-bcma_pcie_read.patch
@ -1,35 +0,0 @@
 From 01d8709c311858c37e02c96464ea4dc954334210 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sat, 14 Jan 2012 20:03:09 +0100
 Subject: [PATCH 25/31] bcma: export bcma_pcie_read()
 This will be needed by the host controller.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/bcma/bcma_private.h |    2 ++
 drivers/bcma/driver_pci.c   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
 --- a/drivers/bcma/bcma_private.h
 +++ b/drivers/bcma/bcma_private.h
@@ -51,6 +51,8 @@ int bcma_sflash_init(struct bcma_drv_cc
 int bcma_nflash_init(struct bcma_drv_cc *cc);
 #endif /* CONFIG_BCMA_NFLASH */
 +u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
 +
 #ifdef CONFIG_BCMA_HOST_PCI
 /* host_pci.c */
 extern int __init bcma_host_pci_init(void);
 --- a/drivers/bcma/driver_pci.c
 +++ b/drivers/bcma/driver_pci.c
@@ -17,7 +17,7 @@
  * R/W ops.
  **************************************************/
 -static u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address)
 +u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address)
 {
 	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
 	pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
--- a/target/linux/brcm47xx/patches-3.2/043-bcma-make-some-functions-__devinit.patch
+++ b/target/linux/brcm47xx/patches-3.2/043-bcma-make-some-functions-__devinit.patch
@ -1,111 +0,0 @@
 From 3cd3138f2ef77e18abc99737c6740f35d61dbbb3 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sun, 15 Jan 2012 23:05:05 +0100
 Subject: [PATCH 26/32] bcma: make some functions __devinit
 bcma_core_pci_hostmode_init() has to be in __devinit as it will call a
 function in that section and so all functions calling it also have to
 be in __devinit.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/bcma/bcma_private.h          |    4 ++--
 drivers/bcma/driver_pci.c            |    6 +++---
 drivers/bcma/driver_pci_host.c       |    2 +-
 drivers/bcma/host_pci.c              |    4 ++--
 drivers/bcma/main.c                  |    2 +-
 include/linux/bcma/bcma_driver_pci.h |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 --- a/drivers/bcma/bcma_private.h
 +++ b/drivers/bcma/bcma_private.h
@@ -13,7 +13,7 @@
 struct bcma_bus;
 /* main.c */
 -int bcma_bus_register(struct bcma_bus *bus);
 +int __devinit bcma_bus_register(struct bcma_bus *bus);
 void bcma_bus_unregister(struct bcma_bus *bus);
 int __init bcma_bus_early_register(struct bcma_bus *bus,
 				   struct bcma_device *core_cc,
@@ -60,7 +60,7 @@ extern void __exit bcma_host_pci_exit(vo
 #endif /* CONFIG_BCMA_HOST_PCI */
 #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
 -void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
 +void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
 #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
 #endif
 --- a/drivers/bcma/driver_pci.c
 +++ b/drivers/bcma/driver_pci.c
@@ -174,12 +174,12 @@ static void bcma_pcicore_serdes_workarou
  * Init.
  **************************************************/
 -static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
 +static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
 {
 	bcma_pcicore_serdes_workaround(pc);
 }
 -static bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
 +static bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
 {
 	struct bcma_bus *bus = pc->core->bus;
 	u16 chipid_top;
@@ -204,7 +204,7 @@ static bool bcma_core_pci_is_in_hostmode
 	return true;
 }
 -void bcma_core_pci_init(struct bcma_drv_pci *pc)
 +void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
 {
 	if (pc->setup_done)
 		return;
 --- a/drivers/bcma/driver_pci_host.c
 +++ b/drivers/bcma/driver_pci_host.c
@@ -8,7 +8,7 @@
 #include "bcma_private.h"
 #include <linux/bcma/bcma.h>
 -void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
 +void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
 {
 	pr_err("No support for PCI core in hostmode yet\n");
 }
 --- a/drivers/bcma/host_pci.c
 +++ b/drivers/bcma/host_pci.c
@@ -154,8 +154,8 @@ const struct bcma_host_ops bcma_host_pci
 	.awrite32	= bcma_host_pci_awrite32,
 };
 -static int bcma_host_pci_probe(struct pci_dev *dev,
 -			     const struct pci_device_id *id)
 +static int __devinit bcma_host_pci_probe(struct pci_dev *dev,
 +					 const struct pci_device_id *id)
 {
 	struct bcma_bus *bus;
 	int err = -ENOMEM;
 --- a/drivers/bcma/main.c
 +++ b/drivers/bcma/main.c
@@ -132,7 +132,7 @@ static void bcma_unregister_cores(struct
 	}
 }
 -int bcma_bus_register(struct bcma_bus *bus)
 +int __devinit bcma_bus_register(struct bcma_bus *bus)
 {
 	int err;
 	struct bcma_device *core;
 --- a/include/linux/bcma/bcma_driver_pci.h
 +++ b/include/linux/bcma/bcma_driver_pci.h
@@ -169,7 +169,7 @@ struct bcma_drv_pci {
 #define pcicore_read32(pc, offset)		bcma_read32((pc)->core, offset)
 #define pcicore_write32(pc, offset, val)	bcma_write32((pc)->core, offset, val)
 -extern void bcma_core_pci_init(struct bcma_drv_pci *pc);
 +extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc);
 extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
 				 struct bcma_device *core, bool enable);
--- a/target/linux/brcm47xx/patches-3.2/044-bcma-add-PCIe-host-controller.patch
+++ b/target/linux/brcm47xx/patches-3.2/044-bcma-add-PCIe-host-controller.patch
@ -1,23 +1,3 @@
 From 47d0e8c2743729b4248585d33b55b6aaeac008d5 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sun, 8 Jan 2012 16:53:15 +0100
 Subject: [PATCH 25/34] bcma: add PCIe host controller
 Some SoCs have a PCIe host controller to make it possible to attach
 some other devices to it, like an other Wifi card.
 This code was tested with an Netgear WNDR3400 (bcm4716 based), but
 should work with all bcma based SoCs.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 arch/mips/pci/pci-bcm47xx.c          |   49 +++-
 drivers/bcma/bcma_private.h          |    1 +
 drivers/bcma/driver_pci.c            |   38 +--
 drivers/bcma/driver_pci_host.c       |  576 +++++++++++++++++++++++++++++++++-
 include/linux/bcma/bcma_driver_pci.h |   34 ++
 include/linux/bcma/bcma_regs.h       |   27 ++
 6 files changed, 686 insertions(+), 39 deletions(-)
 --- a/arch/mips/pci/pci-bcm47xx.c
 +++ b/arch/mips/pci/pci-bcm47xx.c
@@ -25,6 +25,7 @@
@ -94,752 +74,3 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +#endif
 +		return 0;
 +}
 --- a/drivers/bcma/bcma_private.h
 +++ b/drivers/bcma/bcma_private.h
@@ -60,6 +60,7 @@ extern void __exit bcma_host_pci_exit(vo
 #endif /* CONFIG_BCMA_HOST_PCI */
 #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
 +bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);
 void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
 #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
 --- a/drivers/bcma/driver_pci.c
 +++ b/drivers/bcma/driver_pci.c
@@ -2,7 +2,7 @@
  * Broadcom specific AMBA
  * PCI Core
  *
 - * Copyright 2005, Broadcom Corporation
 + * Copyright 2005, 2011, Broadcom Corporation
  * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
  * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
  *
@@ -179,47 +179,19 @@ static void __devinit bcma_core_pci_clie
 	bcma_pcicore_serdes_workaround(pc);
 }
 -static bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
 -{
 -	struct bcma_bus *bus = pc->core->bus;
 -	u16 chipid_top;
 -
 -	chipid_top = (bus->chipinfo.id & 0xFF00);
 -	if (chipid_top != 0x4700 &&
 -	    chipid_top != 0x5300)
 -		return false;
 -
 -#ifdef CONFIG_SSB_DRIVER_PCICORE
 -	if (bus->sprom.boardflags_lo & SSB_BFL_NOPCI)
 -		return false;
 -#endif /* CONFIG_SSB_DRIVER_PCICORE */
 -
 -#if 0
 -	/* TODO: on BCMA we use address from EROM instead of magic formula */
 -	u32 tmp;
 -	return !mips_busprobe32(tmp, (bus->mmio +
 -		(pc->core->core_index * BCMA_CORE_SIZE)));
 -#endif
 -
 -	return true;
 -}
 -
 void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
 {
 	if (pc->setup_done)
 		return;
 -	if (bcma_core_pci_is_in_hostmode(pc)) {
 #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
 +	pc->hostmode = bcma_core_pci_is_in_hostmode(pc);
 +	if (pc->hostmode)
 		bcma_core_pci_hostmode_init(pc);
 -#else
 -		pr_err("Driver compiled without support for hostmode PCI\n");
 #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
 -	} else {
 -		bcma_core_pci_clientmode_init(pc);
 -	}
 -	pc->setup_done = true;
 +	if (!pc->hostmode)
 +		bcma_core_pci_clientmode_init(pc);
 }
 int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
 --- a/drivers/bcma/driver_pci_host.c
 +++ b/drivers/bcma/driver_pci_host.c
@@ -2,13 +2,587 @@
  * Broadcom specific AMBA
  * PCI Core in hostmode
  *
 + * Copyright 2005 - 2011, Broadcom Corporation
 + * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
 + * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
 + *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 #include "bcma_private.h"
 +#include <linux/export.h>
 #include <linux/bcma/bcma.h>
 +#include <asm/paccess.h>
 +
 +/* Probe a 32bit value on the bus and catch bus exceptions.
 + * Returns nonzero on a bus exception.
 + * This is MIPS specific */
 +#define mips_busprobe32(val, addr)	get_dbe((val), ((u32 *)(addr)))
 +
 +/* Assume one-hot slot wiring */
 +#define BCMA_PCI_SLOT_MAX	16
 +#define	PCI_CONFIG_SPACE_SIZE	256
 +
 +bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
 +{
 +	struct bcma_bus *bus = pc->core->bus;
 +	u16 chipid_top;
 +	u32 tmp;
 +
 +	chipid_top = (bus->chipinfo.id & 0xFF00);
 +	if (chipid_top != 0x4700 &&
 +	    chipid_top != 0x5300)
 +		return false;
 +
 +	if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) {
 +		pr_info("This PCI core is disabled and not working\n");
 +		return false;
 +	}
 +
 +	bcma_core_enable(pc->core, 0);
 +
 +	return !mips_busprobe32(tmp, pc->core->io_addr);
 +}
 +
 +static u32 bcma_pcie_read_config(struct bcma_drv_pci *pc, u32 address)
 +{
 +	pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_ADDR, address);
 +	pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_ADDR);
 +	return pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_DATA);
 +}
 +
 +static void bcma_pcie_write_config(struct bcma_drv_pci *pc, u32 address,
 +				   u32 data)
 +{
 +	pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_ADDR, address);
 +	pcicore_read32(pc, BCMA_CORE_PCI_CONFIG_ADDR);
 +	pcicore_write32(pc, BCMA_CORE_PCI_CONFIG_DATA, data);
 +}
 +
 +static u32 bcma_get_cfgspace_addr(struct bcma_drv_pci *pc, unsigned int dev,
 +			     unsigned int func, unsigned int off)
 +{
 +	u32 addr = 0;
 +
 +	/* Issue config commands only when the data link is up (atleast
 +	 * one external pcie device is present).
 +	 */
 +	if (dev >= 2 || !(bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_LSREG)
 +			  & BCMA_CORE_PCI_DLLP_LSREG_LINKUP))
 +		goto out;
 +
 +	/* Type 0 transaction */
 +	/* Slide the PCI window to the appropriate slot */
 +	pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI1, BCMA_CORE_PCI_SBTOPCI_CFG0);
 +	/* Calculate the address */
 +	addr = pc->host_controller->host_cfg_addr;
 +	addr |= (dev << BCMA_CORE_PCI_CFG_SLOT_SHIFT);
 +	addr |= (func << BCMA_CORE_PCI_CFG_FUN_SHIFT);
 +	addr |= (off & ~3);
 +
 +out:
 +	return addr;
 +}
 +
 +static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
 +				  unsigned int func, unsigned int off,
 +				  void *buf, int len)
 +{
 +	int err = -EINVAL;
 +	u32 addr, val;
 +	void __iomem *mmio = 0;
 +
 +	WARN_ON(!pc->hostmode);
 +	if (unlikely(len != 1 && len != 2 && len != 4))
 +		goto out;
 +	if (dev == 0) {
 +		/* we support only two functions on device 0 */
 +		if (func > 1)
 +			return -EINVAL;
 +
 +		/* accesses to config registers with offsets >= 256
 +		 * requires indirect access.
 +		 */
 +		if (off >= PCI_CONFIG_SPACE_SIZE) {
 +			addr = (func << 12);
 +			addr |= (off & 0x0FFF);
 +			val = bcma_pcie_read_config(pc, addr);
 +		} else {
 +			addr = BCMA_CORE_PCI_PCICFG0;
 +			addr |= (func << 8);
 +			addr |= (off & 0xfc);
 +			val = pcicore_read32(pc, addr);
 +		}
 +	} else {
 +		addr = bcma_get_cfgspace_addr(pc, dev, func, off);
 +		if (unlikely(!addr))
 +			goto out;
 +		err = -ENOMEM;
 +		mmio = ioremap_nocache(addr, len);
 +		if (!mmio)
 +			goto out;
 +
 +		if (mips_busprobe32(val, mmio)) {
 +			val = 0xffffffff;
 +			goto unmap;
 +		}
 +
 +		val = readl(mmio);
 +	}
 +	val >>= (8 * (off & 3));
 +
 +	switch (len) {
 +	case 1:
 +		*((u8 *)buf) = (u8)val;
 +		break;
 +	case 2:
 +		*((u16 *)buf) = (u16)val;
 +		break;
 +	case 4:
 +		*((u32 *)buf) = (u32)val;
 +		break;
 +	}
 +	err = 0;
 +unmap:
 +	if (mmio)
 +		iounmap(mmio);
 +out:
 +	return err;
 +}
 +
 +static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
 +				   unsigned int func, unsigned int off,
 +				   const void *buf, int len)
 +{
 +	int err = -EINVAL;
 +	u32 addr = 0, val = 0;
 +	void __iomem *mmio = 0;
 +	u16 chipid = pc->core->bus->chipinfo.id;
 +
 +	WARN_ON(!pc->hostmode);
 +	if (unlikely(len != 1 && len != 2 && len != 4))
 +		goto out;
 +	if (dev == 0) {
 +		/* accesses to config registers with offsets >= 256
 +		 * requires indirect access.
 +		 */
 +		if (off < PCI_CONFIG_SPACE_SIZE) {
 +			addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0;
 +			addr |= (func << 8);
 +			addr |= (off & 0xfc);
 +			mmio = ioremap_nocache(addr, len);
 +			if (!mmio)
 +				goto out;
 +		}
 +	} else {
 +		addr = bcma_get_cfgspace_addr(pc, dev, func, off);
 +		if (unlikely(!addr))
 +			goto out;
 +		err = -ENOMEM;
 +		mmio = ioremap_nocache(addr, len);
 +		if (!mmio)
 +			goto out;
 +
 +		if (mips_busprobe32(val, mmio)) {
 +			val = 0xffffffff;
 +			goto unmap;
 +		}
 +	}
 +
 +	switch (len) {
 +	case 1:
 +		val = readl(mmio);
 +		val &= ~(0xFF << (8 * (off & 3)));
 +		val |= *((const u8 *)buf) << (8 * (off & 3));
 +		break;
 +	case 2:
 +		val = readl(mmio);
 +		val &= ~(0xFFFF << (8 * (off & 3)));
 +		val |= *((const u16 *)buf) << (8 * (off & 3));
 +		break;
 +	case 4:
 +		val = *((const u32 *)buf);
 +		break;
 +	}
 +	if (dev == 0 && !addr) {
 +		/* accesses to config registers with offsets >= 256
 +		 * requires indirect access.
 +		 */
 +		addr = (func << 12);
 +		addr |= (off & 0x0FFF);
 +		bcma_pcie_write_config(pc, addr, val);
 +	} else {
 +		writel(val, mmio);
 +
 +		if (chipid == 0x4716 || chipid == 0x4748)
 +			readl(mmio);
 +	}
 +
 +	err = 0;
 +unmap:
 +	if (mmio)
 +		iounmap(mmio);
 +out:
 +	return err;
 +}
 +
 +static int bcma_core_pci_hostmode_read_config(struct pci_bus *bus,
 +					      unsigned int devfn,
 +					      int reg, int size, u32 *val)
 +{
 +	unsigned long flags;
 +	int err;
 +	struct bcma_drv_pci *pc;
 +	struct bcma_drv_pci_host *pc_host;
 +
 +	pc_host = container_of(bus->ops, struct bcma_drv_pci_host, pci_ops);
 +	pc = pc_host->pdev;
 +
 +	spin_lock_irqsave(&pc_host->cfgspace_lock, flags);
 +	err = bcma_extpci_read_config(pc, PCI_SLOT(devfn),
 +				     PCI_FUNC(devfn), reg, val, size);
 +	spin_unlock_irqrestore(&pc_host->cfgspace_lock, flags);
 +
 +	return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
 +}
 +
 +static int bcma_core_pci_hostmode_write_config(struct pci_bus *bus,
 +					       unsigned int devfn,
 +					       int reg, int size, u32 val)
 +{
 +	unsigned long flags;
 +	int err;
 +	struct bcma_drv_pci *pc;
 +	struct bcma_drv_pci_host *pc_host;
 +
 +	pc_host = container_of(bus->ops, struct bcma_drv_pci_host, pci_ops);
 +	pc = pc_host->pdev;
 +
 +	spin_lock_irqsave(&pc_host->cfgspace_lock, flags);
 +	err = bcma_extpci_write_config(pc, PCI_SLOT(devfn),
 +				      PCI_FUNC(devfn), reg, &val, size);
 +	spin_unlock_irqrestore(&pc_host->cfgspace_lock, flags);
 +
 +	return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
 +}
 +
 +/* return cap_offset if requested capability exists in the PCI config space */
 +static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc,
 +					     unsigned int dev,
 +					     unsigned int func, u8 req_cap_id,
 +					     unsigned char *buf, u32 *buflen)
 +{
 +	u8 cap_id;
 +	u8 cap_ptr = 0;
 +	u32 bufsize;
 +	u8 byte_val;
 +
 +	/* check for Header type 0 */
 +	bcma_extpci_read_config(pc, dev, func, PCI_HEADER_TYPE, &byte_val,
 +				sizeof(u8));
 +	if ((byte_val & 0x7f) != PCI_HEADER_TYPE_NORMAL)
 +		return cap_ptr;
 +
 +	/* check if the capability pointer field exists */
 +	bcma_extpci_read_config(pc, dev, func, PCI_STATUS, &byte_val,
 +				sizeof(u8));
 +	if (!(byte_val & PCI_STATUS_CAP_LIST))
 +		return cap_ptr;
 +
 +	/* check if the capability pointer is 0x00 */
 +	bcma_extpci_read_config(pc, dev, func, PCI_CAPABILITY_LIST, &cap_ptr,
 +				sizeof(u8));
 +	if (cap_ptr == 0x00)
 +		return cap_ptr;
 +
 +	/* loop thr'u the capability list and see if the requested capabilty
 +	 * exists */
 +	bcma_extpci_read_config(pc, dev, func, cap_ptr, &cap_id, sizeof(u8));
 +	while (cap_id != req_cap_id) {
 +		bcma_extpci_read_config(pc, dev, func, cap_ptr + 1, &cap_ptr,
 +					sizeof(u8));
 +		if (cap_ptr == 0x00)
 +			return cap_ptr;
 +		bcma_extpci_read_config(pc, dev, func, cap_ptr, &cap_id,
 +					sizeof(u8));
 +	}
 +
 +	/* found the caller requested capability */
 +	if ((buf != NULL) && (buflen != NULL)) {
 +		u8 cap_data;
 +
 +		bufsize = *buflen;
 +		if (!bufsize)
 +			return cap_ptr;
 +
 +		*buflen = 0;
 +
 +		/* copy the cpability data excluding cap ID and next ptr */
 +		cap_data = cap_ptr + 2;
 +		if ((bufsize + cap_data)  > PCI_CONFIG_SPACE_SIZE)
 +			bufsize = PCI_CONFIG_SPACE_SIZE - cap_data;
 +		*buflen = bufsize;
 +		while (bufsize--) {
 +			bcma_extpci_read_config(pc, dev, func, cap_data, buf,
 +						sizeof(u8));
 +			cap_data++;
 +			buf++;
 +		}
 +	}
 +
 +	return cap_ptr;
 +}
 +
 +/* If the root port is capable of returning Config Request
 + * Retry Status (CRS) Completion Status to software then
 + * enable the feature.
 + */
 +static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc)
 +{
 +	u8 cap_ptr, root_ctrl, root_cap, dev;
 +	u16 val16;
 +	int i;
 +
 +	cap_ptr = bcma_find_pci_capability(pc, 0, 0, PCI_CAP_ID_EXP, NULL,
 +					   NULL);
 +	root_cap = cap_ptr + PCI_EXP_RTCAP;
 +	bcma_extpci_read_config(pc, 0, 0, root_cap, &val16, sizeof(u16));
 +	if (val16 & BCMA_CORE_PCI_RC_CRS_VISIBILITY) {
 +		/* Enable CRS software visibility */
 +		root_ctrl = cap_ptr + PCI_EXP_RTCTL;
 +		val16 = PCI_EXP_RTCTL_CRSSVE;
 +		bcma_extpci_read_config(pc, 0, 0, root_ctrl, &val16,
 +					sizeof(u16));
 +
 +		/* Initiate a configuration request to read the vendor id
 +		 * field of the device function's config space header after
 +		 * 100 ms wait time from the end of Reset. If the device is
 +		 * not done with its internal initialization, it must at
 +		 * least return a completion TLP, with a completion status
 +		 * of "Configuration Request Retry Status (CRS)". The root
 +		 * complex must complete the request to the host by returning
 +		 * a read-data value of 0001h for the Vendor ID field and
 +		 * all 1s for any additional bytes included in the request.
 +		 * Poll using the config reads for max wait time of 1 sec or
 +		 * until we receive the successful completion status. Repeat
 +		 * the procedure for all the devices.
 +		 */
 +		for (dev = 1; dev < BCMA_PCI_SLOT_MAX; dev++) {
 +			for (i = 0; i < 100000; i++) {
 +				bcma_extpci_read_config(pc, dev, 0,
 +							PCI_VENDOR_ID, &val16,
 +							sizeof(val16));
 +				if (val16 != 0x1)
 +					break;
 +				udelay(10);
 +			}
 +			if (val16 == 0x1)
 +				pr_err("PCI: Broken device in slot %d\n", dev);
 +		}
 +	}
 +}
 void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
 {
 -	pr_err("No support for PCI core in hostmode yet\n");
 +	struct bcma_bus *bus = pc->core->bus;
 +	struct bcma_drv_pci_host *pc_host;
 +	u32 tmp;
 +	u32 pci_membase_1G;
 +	unsigned long io_map_base;
 +
 +	pr_info("PCIEcore in host mode found\n");
 +
 +	pc_host = kzalloc(sizeof(*pc_host), GFP_KERNEL);
 +	if (!pc_host)  {
 +		pr_err("can not allocate memory");
 +		return;
 +	}
 +
 +	pc->host_controller = pc_host;
 +	pc_host->pci_controller.io_resource = &pc_host->io_resource;
 +	pc_host->pci_controller.mem_resource = &pc_host->mem_resource;
 +	pc_host->pci_controller.pci_ops = &pc_host->pci_ops;
 +	pc_host->pdev = pc;
 +
 +	pci_membase_1G = BCMA_SOC_PCI_DMA;
 +	pc_host->host_cfg_addr = BCMA_SOC_PCI_CFG;
 +
 +	pc_host->pci_ops.read = bcma_core_pci_hostmode_read_config;
 +	pc_host->pci_ops.write = bcma_core_pci_hostmode_write_config;
 +
 +	pc_host->mem_resource.name = "BCMA PCIcore external memory",
 +	pc_host->mem_resource.start = BCMA_SOC_PCI_DMA;
 +	pc_host->mem_resource.end = BCMA_SOC_PCI_DMA + BCMA_SOC_PCI_DMA_SZ - 1;
 +	pc_host->mem_resource.flags = IORESOURCE_MEM | IORESOURCE_PCI_FIXED;
 +
 +	pc_host->io_resource.name = "BCMA PCIcore external I/O",
 +	pc_host->io_resource.start = 0x100;
 +	pc_host->io_resource.end = 0x7FF;
 +	pc_host->io_resource.flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED;
 +
 +	/* Reset RC */
 +	udelay(3000);
 +	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE);
 +	udelay(1000);
 +	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST |
 +			BCMA_CORE_PCI_CTL_RST_OE);
 +
 +	/* 64 MB I/O access window. On 4716, use
 +	 * sbtopcie0 to access the device registers. We
 +	 * can't use address match 2 (1 GB window) region
 +	 * as mips can't generate 64-bit address on the
 +	 * backplane.
 +	 */
 +	if (bus->chipinfo.id == 0x4716 || bus->chipinfo.id == 0x4748) {
 +		pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
 +		pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
 +					    BCMA_SOC_PCI_MEM_SZ - 1;
 +		pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
 +				BCMA_CORE_PCI_SBTOPCI_MEM | BCMA_SOC_PCI_MEM);
 +	} else if (bus->chipinfo.id == 0x5300) {
 +		tmp = BCMA_CORE_PCI_SBTOPCI_MEM;
 +		tmp |= BCMA_CORE_PCI_SBTOPCI_PREF;
 +		tmp |= BCMA_CORE_PCI_SBTOPCI_BURST;
 +		if (pc->core->core_unit == 0) {
 +			pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
 +			pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
 +						    BCMA_SOC_PCI_MEM_SZ - 1;
 +			pci_membase_1G = BCMA_SOC_PCIE_DMA_H32;
 +			pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
 +					tmp | BCMA_SOC_PCI_MEM);
 +		} else if (pc->core->core_unit == 1) {
 +			pc_host->mem_resource.start = BCMA_SOC_PCI1_MEM;
 +			pc_host->mem_resource.end = BCMA_SOC_PCI1_MEM +
 +						    BCMA_SOC_PCI_MEM_SZ - 1;
 +			pci_membase_1G = BCMA_SOC_PCIE1_DMA_H32;
 +			pc_host->host_cfg_addr = BCMA_SOC_PCI1_CFG;
 +			pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
 +					tmp | BCMA_SOC_PCI1_MEM);
 +		}
 +	} else
 +		pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
 +				BCMA_CORE_PCI_SBTOPCI_IO);
 +
 +	/* 64 MB configuration access window */
 +	pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI1, BCMA_CORE_PCI_SBTOPCI_CFG0);
 +
 +	/* 1 GB memory access window */
 +	pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI2,
 +			BCMA_CORE_PCI_SBTOPCI_MEM | pci_membase_1G);
 +
 +
 +	/* As per PCI Express Base Spec 1.1 we need to wait for
 +	 * at least 100 ms from the end of a reset (cold/warm/hot)
 +	 * before issuing configuration requests to PCI Express
 +	 * devices.
 +	 */
 +	udelay(100000);
 +
 +	bcma_core_pci_enable_crs(pc);
 +
 +	/* Enable PCI bridge BAR0 memory & master access */
 +	tmp = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
 +	bcma_extpci_write_config(pc, 0, 0, PCI_COMMAND, &tmp, sizeof(tmp));
 +
 +	/* Enable PCI interrupts */
 +	pcicore_write32(pc, BCMA_CORE_PCI_IMASK, BCMA_CORE_PCI_IMASK_INTA);
 +
 +	/* Ok, ready to run, register it to the system.
 +	 * The following needs change, if we want to port hostmode
 +	 * to non-MIPS platform. */
 +	io_map_base = (unsigned long)ioremap_nocache(BCMA_SOC_PCI_MEM,
 +						     0x04000000);
 +	pc_host->pci_controller.io_map_base = io_map_base;
 +	set_io_port_base(pc_host->pci_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. */
 +	mdelay(10);
 +	register_pci_controller(&pc_host->pci_controller);
 +	return;
 +}
 +
 +/* Early PCI fixup for a device on the PCI-core bridge. */
 +static void bcma_core_pci_fixup_pcibridge(struct pci_dev *dev)
 +{
 +	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
 +		/* This is not a device on the PCI-core bridge. */
 +		return;
 +	}
 +	if (PCI_SLOT(dev->devfn) != 0)
 +		return;
 +
 +	pr_info("PCI: Fixing up bridge %s\n", pci_name(dev));
 +
 +	/* Enable PCI bridge bus mastering and memory space */
 +	pci_set_master(dev);
 +	if (pcibios_enable_device(dev, ~0) < 0) {
 +		pr_err("PCI: BCMA bridge enable failed\n");
 +		return;
 +	}
 +
 +	/* Enable PCI bridge BAR1 prefetch and burst */
 +	pci_write_config_dword(dev, BCMA_PCI_BAR1_CONTROL, 3);
 +}
 +DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_pcibridge);
 +
 +/* Early PCI fixup for all PCI-cores to set the correct memory address. */
 +static void bcma_core_pci_fixup_addresses(struct pci_dev *dev)
 +{
 +	struct resource *res;
 +	int pos;
 +
 +	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
 +		/* This is not a device on the PCI-core bridge. */
 +		return;
 +	}
 +	if (PCI_SLOT(dev->devfn) == 0)
 +		return;
 +
 +	pr_info("PCI: Fixing up addresses %s\n", pci_name(dev));
 +
 +	for (pos = 0; pos < 6; pos++) {
 +		res = &dev->resource[pos];
 +		if (res->flags & (IORESOURCE_IO | IORESOURCE_MEM))
 +			pci_assign_resource(dev, pos);
 +	}
 +}
 +DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_addresses);
 +
 +/* This function is called when doing a pci_enable_device().
 + * We must first check if the device is a device on the PCI-core bridge. */
 +int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
 +{
 +	struct bcma_drv_pci_host *pc_host;
 +
 +	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
 +		/* This is not a device on the PCI-core bridge. */
 +		return -ENODEV;
 +	}
 +	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
 +			       pci_ops);
 +
 +	pr_info("PCI: Fixing up device %s\n", pci_name(dev));
 +
 +	/* Fix up interrupt lines */
 +	dev->irq = bcma_core_mips_irq(pc_host->pdev->core) + 2;
 +	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
 +
 +	return 0;
 +}
 +EXPORT_SYMBOL(bcma_core_pci_plat_dev_init);
 +
 +/* PCI device IRQ mapping. */
 +int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev)
 +{
 +	struct bcma_drv_pci_host *pc_host;
 +
 +	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
 +		/* This is not a device on the PCI-core bridge. */
 +		return -ENODEV;
 +	}
 +
 +	pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
 +			       pci_ops);
 +	return bcma_core_mips_irq(pc_host->pdev->core) + 2;
 }
 +EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
 --- a/include/linux/bcma/bcma_driver_pci.h
 +++ b/include/linux/bcma/bcma_driver_pci.h
@@ -160,9 +160,40 @@ struct pci_dev;
 /* PCIcore specific boardflags */
 #define BCMA_CORE_PCI_BFL_NOPCI			0x00000400 /* Board leaves PCI floating */
 +/* PCIE Config space accessing MACROS */
 +#define BCMA_CORE_PCI_CFG_BUS_SHIFT		24	/* Bus shift */
 +#define BCMA_CORE_PCI_CFG_SLOT_SHIFT		19	/* Slot/Device shift */
 +#define BCMA_CORE_PCI_CFG_FUN_SHIFT		16	/* Function shift */
 +#define BCMA_CORE_PCI_CFG_OFF_SHIFT		0	/* Register shift */
 +
 +#define BCMA_CORE_PCI_CFG_BUS_MASK		0xff	/* Bus mask */
 +#define BCMA_CORE_PCI_CFG_SLOT_MASK		0x1f	/* Slot/Device mask */
 +#define BCMA_CORE_PCI_CFG_FUN_MASK		7	/* Function mask */
 +#define BCMA_CORE_PCI_CFG_OFF_MASK		0xfff	/* Register mask */
 +
 +/* PCIE Root Capability Register bits (Host mode only) */
 +#define BCMA_CORE_PCI_RC_CRS_VISIBILITY		0x0001
 +
 +struct bcma_drv_pci;
 +
 +struct bcma_drv_pci_host {
 +	struct bcma_drv_pci *pdev;
 +
 +	u32 host_cfg_addr;
 +	spinlock_t cfgspace_lock;
 +
 +	struct pci_controller pci_controller;
 +	struct pci_ops pci_ops;
 +	struct resource mem_resource;
 +	struct resource io_resource;
 +};
 +
 struct bcma_drv_pci {
 	struct bcma_device *core;
 	u8 setup_done:1;
 +	u8 hostmode:1;
 +
 +	struct bcma_drv_pci_host *host_controller;
 };
 /* Register access */
@@ -173,4 +204,7 @@ extern void __devinit bcma_core_pci_init
 extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
 				 struct bcma_device *core, bool enable);
 +extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
 +extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
 +
 #endif /* LINUX_BCMA_DRIVER_PCI_H_ */
 --- a/include/linux/bcma/bcma_regs.h
 +++ b/include/linux/bcma/bcma_regs.h
@@ -56,4 +56,31 @@
 #define  BCMA_PCI_GPIO_XTAL		0x40	/* PCI config space GPIO 14 for Xtal powerup */
 #define  BCMA_PCI_GPIO_PLL		0x80	/* PCI config space GPIO 15 for PLL powerdown */
 +/* SiliconBackplane Address Map.
 + * All regions may not exist on all chips.
 + */
 +#define BCMA_SOC_SDRAM_BASE		0x00000000U	/* Physical SDRAM */
 +#define BCMA_SOC_PCI_MEM		0x08000000U	/* Host Mode sb2pcitranslation0 (64 MB) */
 +#define BCMA_SOC_PCI_MEM_SZ		(64 * 1024 * 1024)
 +#define BCMA_SOC_PCI_CFG		0x0c000000U	/* Host Mode sb2pcitranslation1 (64 MB) */
 +#define BCMA_SOC_SDRAM_SWAPPED		0x10000000U	/* Byteswapped Physical SDRAM */
 +#define BCMA_SOC_SDRAM_R2		0x80000000U	/* Region 2 for sdram (512 MB) */
 +
 +
 +#define BCMA_SOC_PCI_DMA		0x40000000U	/* Client Mode sb2pcitranslation2 (1 GB) */
 +#define BCMA_SOC_PCI_DMA2		0x80000000U	/* Client Mode sb2pcitranslation2 (1 GB) */
 +#define BCMA_SOC_PCI_DMA_SZ		0x40000000U	/* Client Mode sb2pcitranslation2 size in bytes */
 +#define BCMA_SOC_PCIE_DMA_L32		0x00000000U	/* PCIE Client Mode sb2pcitranslation2
 +							 * (2 ZettaBytes), low 32 bits
 +							 */
 +#define BCMA_SOC_PCIE_DMA_H32		0x80000000U	/* PCIE Client Mode sb2pcitranslation2
 +							 * (2 ZettaBytes), high 32 bits
 +							 */
 +
 +#define BCMA_SOC_PCI1_MEM		0x40000000U	/* Host Mode sb2pcitranslation0 (64 MB) */
 +#define BCMA_SOC_PCI1_CFG		0x44000000U	/* Host Mode sb2pcitranslation1 (64 MB) */
 +#define BCMA_SOC_PCIE1_DMA_H32		0xc0000000U	/* PCIE Client Mode sb2pcitranslation2
 +							 * (2 ZettaBytes), high 32 bits
 +							 */
 +
 #endif /* LINUX_BCMA_REGS_H_ */
--- a/target/linux/brcm47xx/patches-3.2/045-bcma-add-bus-num-counter.patch
+++ b/target/linux/brcm47xx/patches-3.2/045-bcma-add-bus-num-counter.patch
@ -1,59 +0,0 @@
 From eecd733c14952b074d7488934a4f3dc83c9c426b Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sat, 14 Jan 2012 16:29:51 +0100
 Subject: [PATCH 28/32] bcma: add bus num counter
 If we have two bcma buses on one computer the second will not work
 without this patch. Now each bus gets an own number.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/bcma/main.c       |   12 +++++++++++-
 include/linux/bcma/bcma.h |    1 +
 2 files changed, 12 insertions(+), 1 deletions(-)
 --- a/drivers/bcma/main.c
 +++ b/drivers/bcma/main.c
@@ -13,6 +13,12 @@
 MODULE_DESCRIPTION("Broadcom's specific AMBA driver");
 MODULE_LICENSE("GPL");
 +/* contains the number the next bus should get. */
 +static unsigned int bcma_bus_next_num = 0;
 +
 +/* bcma_buses_mutex locks the bcma_bus_next_num */
 +static DEFINE_MUTEX(bcma_buses_mutex);
 +
 static int bcma_bus_match(struct device *dev, struct device_driver *drv);
 static int bcma_device_probe(struct device *dev);
 static int bcma_device_remove(struct device *dev);
@@ -93,7 +99,7 @@ static int bcma_register_cores(struct bc
 		core->dev.release = bcma_release_core_dev;
 		core->dev.bus = &bcma_bus_type;
 -		dev_set_name(&core->dev, "bcma%d:%d", 0/*bus->num*/, dev_id);
 +		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);
 		switch (bus->hosttype) {
 		case BCMA_HOSTTYPE_PCI:
@@ -137,6 +143,10 @@ int __devinit bcma_bus_register(struct b
 	int err;
 	struct bcma_device *core;
 +	mutex_lock(&bcma_buses_mutex);
 +	bus->num = bcma_bus_next_num++;
 +	mutex_unlock(&bcma_buses_mutex);
 +
 	/* Scan for devices (cores) */
 	err = bcma_bus_scan(bus);
 	if (err) {
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
@@ -196,6 +196,7 @@ struct bcma_bus {
 	struct list_head cores;
 	u8 nr_cores;
 	u8 init_done:1;
 +	u8 num;
 	struct bcma_drv_cc drv_cc;
 	struct bcma_drv_pci drv_pci;
--- a/target/linux/brcm47xx/patches-3.2/046-bcma-add-extra-sprom-check.patch
+++ b/target/linux/brcm47xx/patches-3.2/046-bcma-add-extra-sprom-check.patch
@ -1,62 +0,0 @@
 From 1cd3d0de72e42161fe0df355c5429459265aeef0 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sat, 14 Jan 2012 16:11:17 +0100
 Subject: [PATCH 30/32] bcma: add extra sprom check
 This check is needed on the BCM43224 device as it says in the
 capabilities it has an sprom but is extra check says it has not.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/bcma/sprom.c                        |    8 ++++++++
 include/linux/bcma/bcma_driver_chipcommon.h |   16 ++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
 --- a/drivers/bcma/sprom.c
 +++ b/drivers/bcma/sprom.c
@@ -209,6 +209,7 @@ int bcma_sprom_get(struct bcma_bus *bus)
 {
 	u16 offset;
 	u16 *sprom;
 +	u32 sromctrl;
 	int err = 0;
 	if (!bus->drv_cc.core)
@@ -217,6 +218,12 @@ int bcma_sprom_get(struct bcma_bus *bus)
 	if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
 		return -ENOENT;
 +	if (bus->drv_cc.core->id.rev >= 32) {
 +		sromctrl = bcma_read32(bus->drv_cc.core, BCMA_CC_SROM_CONTROL);
 +		if (!(sromctrl & BCMA_CC_SROM_CONTROL_PRESENT))
 +			return -ENOENT;
 +	}
 +
 	sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 			GFP_KERNEL);
 	if (!sprom)
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -239,6 +239,22 @@
 #define BCMA_CC_FLASH_CFG		0x0128
 #define  BCMA_CC_FLASH_CFG_DS		0x0010	/* Data size, 0=8bit, 1=16bit */
 #define BCMA_CC_FLASH_WAITCNT		0x012C
 +#define BCMA_CC_SROM_CONTROL		0x0190
 +#define  BCMA_CC_SROM_CONTROL_START	0x80000000
 +#define  BCMA_CC_SROM_CONTROL_BUSY	0x80000000
 +#define  BCMA_CC_SROM_CONTROL_OPCODE	0x60000000
 +#define  BCMA_CC_SROM_CONTROL_OP_READ	0x00000000
 +#define  BCMA_CC_SROM_CONTROL_OP_WRITE	0x20000000
 +#define  BCMA_CC_SROM_CONTROL_OP_WRDIS	0x40000000
 +#define  BCMA_CC_SROM_CONTROL_OP_WREN	0x60000000
 +#define  BCMA_CC_SROM_CONTROL_OTPSEL	0x00000010
 +#define  BCMA_CC_SROM_CONTROL_LOCK	0x00000008
 +#define  BCMA_CC_SROM_CONTROL_SIZE_MASK	0x00000006
 +#define  BCMA_CC_SROM_CONTROL_SIZE_1K	0x00000000
 +#define  BCMA_CC_SROM_CONTROL_SIZE_4K	0x00000002
 +#define  BCMA_CC_SROM_CONTROL_SIZE_16K	0x00000004
 +#define  BCMA_CC_SROM_CONTROL_SIZE_SHIFT	1
 +#define  BCMA_CC_SROM_CONTROL_PRESENT	0x00000001
 /* 0x1E0 is defined as shared BCMA_CLKCTLST */
 #define BCMA_CC_HW_WORKAROUND		0x01E4 /* Hardware workaround (rev >= 20) */
 #define BCMA_CC_UART0_DATA		0x0300
--- a/target/linux/brcm47xx/patches-3.2/047-bcma-add-new-PCI-ID.patch
+++ b/target/linux/brcm47xx/patches-3.2/047-bcma-add-new-PCI-ID.patch
@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 --- a/drivers/bcma/host_pci.c
 +++ b/drivers/bcma/host_pci.c
-@@ -278,6 +278,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_
+@@ -269,6 +269,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
--- a/target/linux/brcm47xx/patches-3.2/051-ssb-fix-cardbus-in-hostmode.patch
+++ b/target/linux/brcm47xx/patches-3.2/051-ssb-fix-cardbus-in-hostmode.patch
@ -1,22 +0,0 @@
 From 7b90e7040b9783b91a4e2baf72ac32d3a00f9f2d Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sat, 21 Jan 2012 11:18:25 +0100
 Subject: [PATCH 31/34] ssb: fix cardbus in hostmode
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/ssb/driver_pcicore.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 --- a/drivers/ssb/driver_pcicore.c
 +++ b/drivers/ssb/driver_pcicore.c
@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
--- a/target/linux/brcm47xx/patches-3.2/052-bcma-complete-workaround-for-BCMA43224.patch
+++ b/target/linux/brcm47xx/patches-3.2/052-bcma-complete-workaround-for-BCMA43224.patch
@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 --- a/drivers/bcma/driver_chipcommon_pmu.c
 +++ b/drivers/bcma/driver_chipcommon_pmu.c
-@@ -141,12 +141,19 @@ void bcma_pmu_workarounds(struct bcma_dr
+@@ -142,12 +142,19 @@ void bcma_pmu_workarounds(struct bcma_dr
 		/* BCM4331 workaround is SPROM-related, we put it in sprom.c */
 		break;
 	case 43224:
@ -38,7 +38,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 	case 43225:
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -374,6 +374,11 @@
+@@ -382,6 +382,11 @@
 #define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4	BIT(16)	/* enable bt_shd0 at gpio4 */
 #define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5	BIT(17)	/* enable bt_shd1 at gpio5 */
--- a/target/linux/brcm47xx/patches-3.2/053-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch
+++ b/target/linux/brcm47xx/patches-3.2/053-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch
@ -1,39 +0,0 @@
 From 293fcc92dae1284c35a3bb51e7f9eb13b52e58fe Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Tue, 31 Jan 2012 23:36:44 +0100
 Subject: [PATCH 2/4] bcma: log the id, rev and pkg of the chip found
 This makes us see what type of hardware someone uses by the dmesg
 output.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/bcma/scan.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
 --- a/drivers/bcma/scan.c
 +++ b/drivers/bcma/scan.c
@@ -364,6 +364,7 @@ static int bcma_get_next_core(struct bcm
 void bcma_init_bus(struct bcma_bus *bus)
 {
 	s32 tmp;
 +	struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
 	if (bus->init_done)
 		return;
@@ -374,9 +375,12 @@ void bcma_init_bus(struct bcma_bus *bus)
 	bcma_scan_switch_core(bus, BCMA_ADDR_BASE);
 	tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);
 -	bus->chipinfo.id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
 -	bus->chipinfo.rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
 -	bus->chipinfo.pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
 +	chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
 +	chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
 +	chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
 +	pr_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
 +		chipinfo->id, chipinfo->rev, chipinfo->pkg);
 +
 	bus->init_done = true;
 }
--- a/target/linux/brcm47xx/patches-3.2/054-ssb-log-the-id-rev-and-pkg-of-the-chip-found.patch
+++ b/target/linux/brcm47xx/patches-3.2/054-ssb-log-the-id-rev-and-pkg-of-the-chip-found.patch
@ -1,25 +0,0 @@
 From 7ddcc963030bbc82add2efbd49e696ae8aff3ae6 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Tue, 31 Jan 2012 23:38:36 +0100
 Subject: [PATCH 3/4] ssb: log the id, rev and pkg of the chip found
 This makes us see what type of hardware someone uses by the dmesg
 output.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/ssb/scan.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
 --- a/drivers/ssb/scan.c
 +++ b/drivers/ssb/scan.c
@@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
--- a/target/linux/brcm47xx/patches-3.2/190-ssb-sprom-fix-some-sizes-signedness.patch
+++ b/target/linux/brcm47xx/patches-3.2/190-ssb-sprom-fix-some-sizes-signedness.patch
@ -1,39 +0,0 @@
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -33,8 +33,8 @@ struct ssb_sprom {
 	u8 et1mdcport;		/* MDIO for enet1 */
 	u16 board_rev;		/* Board revision number from SPROM. */
 	u8 country_code;	/* Country Code */
 -	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 -	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 +	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
@@ -53,10 +53,10 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
@@ -67,8 +67,8 @@ struct ssb_sprom {
 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	s8 rxpo2g;		/* 2GHz RX power offset */
 +	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
 	u8 rssismc2g;
 	u8 rssismf2g;
--- a/target/linux/brcm47xx/patches-3.2/192-ssb-fix-per-path-sprom-vars.patch
+++ b/target/linux/brcm47xx/patches-3.2/192-ssb-fix-per-path-sprom-vars.patch
@ -1,11 +0,0 @@
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -19,7 +19,7 @@ struct ssb_driver;
 struct ssb_sprom_core_pwr_info {
 	u8 itssi_2g, itssi_5g;
 	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
 -	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
 +	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 };
 struct ssb_sprom {
--- a/target/linux/brcm47xx/patches-3.2/193-ssb-add-alpha2.patch
+++ b/target/linux/brcm47xx/patches-3.2/193-ssb-add-alpha2.patch
@ -1,10 +0,0 @@
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -33,6 +33,7 @@ struct ssb_sprom {
 	u8 et1mdcport;		/* MDIO for enet1 */
 	u16 board_rev;		/* Board revision number 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 */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
--- a/target/linux/brcm47xx/patches-3.2/194-ssb-add-some-missing-sprom-attributes.patch
+++ b/target/linux/brcm47xx/patches-3.2/194-ssb-add-some-missing-sprom-attributes.patch
@ -1,93 +0,0 @@
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -32,6 +32,8 @@ struct ssb_sprom {
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 	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 */
@@ -112,7 +114,79 @@ struct ssb_sprom {
 		} ghz5;
 	} fem;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
 /* Information about the PCB the circuitry is soldered on. */
--- a/target/linux/brcm47xx/patches-3.2/195-bcma-export-bcma_find_core.patch
+++ b/target/linux/brcm47xx/patches-3.2/195-bcma-export-bcma_find_core.patch
@ -1,30 +0,0 @@
 --- a/drivers/bcma/main.c
 +++ b/drivers/bcma/main.c
@@ -61,7 +61,7 @@ static struct bus_type bcma_bus_type = {
 	.dev_attrs	= bcma_device_attrs,
 };
 -static struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
 +struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
 {
 	struct bcma_device *core;
@@ -71,6 +71,7 @@ static struct bcma_device *bcma_find_cor
 	}
 	return NULL;
 }
 +EXPORT_SYMBOL_GPL(bcma_find_core);
 static void bcma_release_core_dev(struct device *dev)
 {
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
@@ -285,6 +285,7 @@ static inline void bcma_maskset16(struct
 	bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set);
 }
 +extern struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid);
 extern bool bcma_core_is_enabled(struct bcma_device *core);
 extern void bcma_core_disable(struct bcma_device *core, u32 flags);
 extern int bcma_core_enable(struct bcma_device *core, u32 flags);
--- a/target/linux/brcm47xx/patches-3.2/196-bcma-add-support-for-sprom-not-found-on-the-device.patch
+++ b/target/linux/brcm47xx/patches-3.2/196-bcma-add-support-for-sprom-not-found-on-the-device.patch
@ -1,125 +0,0 @@
 --- a/drivers/bcma/sprom.c
 +++ b/drivers/bcma/sprom.c
@@ -2,6 +2,8 @@
  * Broadcom specific AMBA
  * SPROM reading
  *
 + * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
 + *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -16,6 +18,45 @@
 #define SPOFF(offset)	((offset) / sizeof(u16))
 +static int(*get_fallback_sprom)(struct bcma_bus *dev, struct ssb_sprom *out);
 +
 +/**
 + * bcma_arch_register_fallback_sprom - Registers a method providing a
 + * fallback SPROM if no SPROM is found.
 + *
 + * @sprom_callback: The callback function.
 + *
 + * With this function the architecture implementation may register a
 + * callback handler which fills the SPROM data structure. The fallback is
 + * used for PCI based BCMA devices, where no valid SPROM can be found
 + * in the shadow registers and to provide the SPROM for SoCs where BCMA is
 + * to controll the system bus.
 + *
 + * This function is useful for weird architectures that have a half-assed
 + * BCMA device hardwired to their PCI bus.
 + *
 + * This function is available for architecture code, only. So it is not
 + * exported.
 + */
 +int bcma_arch_register_fallback_sprom(int (*sprom_callback)(struct bcma_bus *bus,
 +				     struct ssb_sprom *out))
 +{
 +	if (get_fallback_sprom)
 +		return -EEXIST;
 +	get_fallback_sprom = sprom_callback;
 +
 +	return 0;
 +}
 +
 +static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus,
 +					 struct ssb_sprom *out)
 +{
 +	if (!get_fallback_sprom)
 +		return -ENOENT;
 +
 +	return get_fallback_sprom(bus, out);
 +}
 +
 /**************************************************
  * R/W ops.
  **************************************************/
@@ -205,23 +246,43 @@ static void bcma_sprom_extract_r8(struct
 		SSB_SROM8_FEM_ANTSWLUT) >> SSB_SROM8_FEM_ANTSWLUT_SHIFT;
 }
 +static bool bcma_is_sprom_available(struct bcma_bus *bus)
 +{
 +	u32 sromctrl;
 +
 +	if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
 +		return false;
 +
 +	if (bus->drv_cc.core->id.rev >= 32) {
 +		sromctrl = bcma_read32(bus->drv_cc.core, BCMA_CC_SROM_CONTROL);
 +		return sromctrl & BCMA_CC_SROM_CONTROL_PRESENT;
 +	}
 +	return true;
 +}
 +
 int bcma_sprom_get(struct bcma_bus *bus)
 {
 	u16 offset;
 	u16 *sprom;
 -	u32 sromctrl;
 	int err = 0;
 	if (!bus->drv_cc.core)
 		return -EOPNOTSUPP;
 -	if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM))
 -		return -ENOENT;
 -
 -	if (bus->drv_cc.core->id.rev >= 32) {
 -		sromctrl = bcma_read32(bus->drv_cc.core, BCMA_CC_SROM_CONTROL);
 -		if (!(sromctrl & BCMA_CC_SROM_CONTROL_PRESENT))
 -			return -ENOENT;
 +	if (!bcma_is_sprom_available(bus)) {
 +		/*
 +		 * Maybe there is no SPROM on the device?
 +		 * Now we ask the arch code if there is some sprom
 +		 * available for this device in some other storage.
 +		 */
 +		err = bcma_fill_sprom_with_fallback(bus, &bus->sprom);
 +		if (err) {
 +			pr_warn("Using fallback SPROM failed (err %d)\n", err);
 +		} else {
 +			pr_debug("Using SPROM revision %d provided by"
 +				 " platform.\n", bus->sprom.revision);
 +			return 0;
 +		}
 	}
 	sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
@@ -177,6 +177,12 @@ int __bcma_driver_register(struct bcma_d
 extern void bcma_driver_unregister(struct bcma_driver *drv);
 +/* Set a fallback SPROM.
 + * See kdoc at the function definition for complete documentation. */
 +extern int bcma_arch_register_fallback_sprom(
 +		int (*sprom_callback)(struct bcma_bus *bus,
 +		struct ssb_sprom *out));
 +
 struct bcma_bus {
 	/* The MMIO area. */
 	void __iomem *mmio;
--- a/target/linux/brcm47xx/patches-3.2/199-MIPS-BCM47XX-move-and-extend-sprom-parsing.patch
+++ b/target/linux/brcm47xx/patches-3.2/199-MIPS-BCM47XX-move-and-extend-sprom-parsing.patch
@ -344,8 +344,8 @@
 +	nvram_read_u8(prefix, NULL, "ledbh3", &sprom->gpio3, 0xff);
 +	nvram_read_u8(prefix, NULL, "aa2g", &sprom->ant_available_bg, 0);
 +	nvram_read_u8(prefix, NULL, "aa5g", &sprom->ant_available_a, 0);
-+	nvram_read_s8(prefix, NULL, "ag0", &sprom->antenna_gain.ghz24.a0, 0);
+	nvram_read_s8(prefix, NULL, "ag0", &sprom->antenna_gain.a0, 0);
-+	nvram_read_s8(prefix, NULL, "ag1", &sprom->antenna_gain.ghz24.a1, 0);
+	nvram_read_s8(prefix, NULL, "ag1", &sprom->antenna_gain.a1, 0);
 +	nvram_read_alpha2(prefix, "ccode", &sprom->alpha2);
 +}
 +
@ -428,8 +428,8 @@
 +			 &sprom->boardflags2_hi);
 +	nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0);
 +	nvram_read_u8(prefix, NULL, "regrev", &sprom->regrev, 0);
-+	nvram_read_s8(prefix, NULL, "ag2", &sprom->antenna_gain.ghz24.a2, 0);
+	nvram_read_s8(prefix, NULL, "ag2", &sprom->antenna_gain.a2, 0);
-+	nvram_read_s8(prefix, NULL, "ag3", &sprom->antenna_gain.ghz24.a3, 0);
+	nvram_read_s8(prefix, NULL, "ag3", &sprom->antenna_gain.a3, 0);
 +	nvram_read_u8(prefix, NULL, "txchain", &sprom->txchain, 0xf);
 +	nvram_read_u8(prefix, NULL, "rxchain", &sprom->rxchain, 0xf);
 +	nvram_read_u8(prefix, NULL, "antswitch", &sprom->antswitch, 0xff);
--- a/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
@ -1,134 +0,0 @@
 From 6d174f732e198aae8583cc5414b11b988bfd37a9 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Mon, 30 Jan 2012 22:44:15 +0100
 Subject: [PATCH 4/4] ssb: add support for bcm5354
 This patch adds support the the BCM5354 SoC.
 It has a PMU and a constant not configurable clock.
 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
 drivers/ssb/driver_chipcommon_pmu.c |   48 +++++++++++++++++++++++++++++++---
 drivers/ssb/driver_mipscore.c       |    3 ++
 drivers/ssb/main.c                  |    3 ++
 drivers/ssb/ssb_private.h           |    4 +++
 4 files changed, 53 insertions(+), 5 deletions(-)
 --- a/drivers/ssb/driver_chipcommon_pmu.c
 +++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -13,6 +13,9 @@
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 #include <linux/export.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_mipscore.c
 +++ b/drivers/ssb/driver_mipscore.c
@@ -232,6 +232,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +	    	return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
@@ -1094,6 +1094,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +	    	return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
@@ -211,4 +211,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
--- a/target/linux/brcm47xx/patches-3.2/232-bcma_account_for_variable_pci_memory.patch
+++ b/target/linux/brcm47xx/patches-3.2/232-bcma_account_for_variable_pci_memory.patch
@ -1,6 +1,6 @@
 --- a/drivers/bcma/driver_pci_host.c
 +++ b/drivers/bcma/driver_pci_host.c
-@@ -490,8 +490,9 @@ void __devinit bcma_core_pci_hostmode_in
+@@ -491,8 +491,9 @@ void __devinit bcma_core_pci_hostmode_in
 	/* Ok, ready to run, register it to the system.
 	 * The following needs change, if we want to port hostmode
 	 * to non-MIPS platform. */
--- a/target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch
+++ b/target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch
@ -1,6 +1,6 @@
 --- a/drivers/bcma/driver_pci_host.c
 +++ b/drivers/bcma/driver_pci_host.c
-@@ -118,7 +118,7 @@ static int bcma_extpci_read_config(struc
+@@ -119,7 +119,7 @@ static int bcma_extpci_read_config(struc
 		if (unlikely(!addr))
 			goto out;
 		err = -ENOMEM;
@ -9,7 +9,7 @@
 		if (!mmio)
 			goto out;
-@@ -170,7 +170,7 @@ static int bcma_extpci_write_config(stru
+@@ -171,7 +171,7 @@ static int bcma_extpci_write_config(stru
 			addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0;
 			addr |= (func << 8);
 			addr |= (off & 0xfc);
@ -18,7 +18,7 @@
 			if (!mmio)
 				goto out;
 		}
-@@ -179,7 +179,7 @@ static int bcma_extpci_write_config(stru
+@@ -180,7 +180,7 @@ static int bcma_extpci_write_config(stru
 		if (unlikely(!addr))
 			goto out;
 		err = -ENOMEM;
--- a/target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch
+++ b/target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch
@ -1,29 +0,0 @@
 --- a/drivers/bcma/scan.c
 +++ b/drivers/bcma/scan.c
@@ -458,15 +458,18 @@ int bcma_bus_scan(struct bcma_bus *bus)
 		core->bus = bus;
 		err = bcma_get_next_core(bus, &eromptr, NULL, core_num, core);
 -		if (err == -ENODEV) {
 -			core_num++;
 -			continue;
 -		} else if (err == -ENXIO)
 -			continue;
 -		else if (err == -ESPIPE)
 -			break;
 -		else if (err < 0)
 +		if (err < 0) {
 +			kfree(core);
 +			if (err == -ENODEV) {
 +				core_num++;
 +				continue;
 +			} else if (err == -ENXIO) {
 +				continue;
 +			} else if (err == -ESPIPE) {
 +				break;
 +			}
 			return err;
 +		}
 		core->core_index = core_num++;
 		bus->nr_cores++;
--- a/target/linux/generic/patches-2.6.30/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.30/025-bcma_backport.patch
--- a/target/linux/generic/patches-2.6.30/941-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.30/941-ssb_update.patch
@ -225,7 +225,17 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct 
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -28,6 +31,21 @@ static void ssb_chipco_pll_write(struct
 	chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
 }
@ -247,8 +257,39 @@
 struct pmu0_plltab_entry {
 	u16 freq;	/* Crystal frequency in kHz.*/
 	u8 xf;		/* Crystal frequency value for PMU control */
-@@ -317,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
+@@ -76,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -305,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -314,9 +332,19 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 +	case 0x4322:
@ -260,7 +301,7 @@
 	default:
 		ssb_printk(KERN_ERR PFX
 			   "ERROR: PLL init unknown for device %04X\n",
-@@ -396,12 +417,15 @@ static void ssb_pmu_resources_init(struc
+@@ -396,12 +424,15 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -278,7 +319,7 @@
 		/* We keep the default settings:
 		 * min_msk = 0xCBB
 		 * max_msk = 0x7FFFF
-@@ -480,9 +504,9 @@ static void ssb_pmu_resources_init(struc
+@@ -480,9 +511,9 @@ static void ssb_pmu_resources_init(struc
 		chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
 }
@ -289,7 +330,7 @@
 	u32 pmucap;
 	if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
-@@ -494,15 +518,91 @@ void ssb_pmu_init(struct ssb_chipcommon 
+@@ -494,15 +525,122 @@ void ssb_pmu_init(struct ssb_chipcommon
 	ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
 		    cc->pmu.rev, pmucap);
@ -390,6 +431,37 @@
 +
 +EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 +EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_gige.c
 +++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
@ -574,7 +646,17 @@
 }
 static void ssb_mips_serial_init(struct ssb_mipscore *mcore)
-@@ -197,17 +253,23 @@ void ssb_mipscore_init(struct ssb_mipsco
+@@ -152,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
@@ -197,17 +256,23 @@ void ssb_mipscore_init(struct ssb_mipsco
 	/* Assign IRQs to all cores on the bus, start with irq line 2, because serial usually takes 1 */
 	for (irq = 2, i = 0; i < bus->nr_devices; i++) {
@ -601,7 +683,7 @@
 		case SSB_DEV_PCI:
 		case SSB_DEV_ETHERNET:
 		case SSB_DEV_ETHERNET_GBIT:
-@@ -218,8 +280,14 @@ void ssb_mipscore_init(struct ssb_mipsco
+@@ -218,8 +283,14 @@ void ssb_mipscore_init(struct ssb_mipsco
 				set_irq(dev, irq++);
 				break;
 			}
@ -639,6 +721,15 @@
 static inline
 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
@@ -69,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -246,20 +251,12 @@ static struct pci_controller ssb_pcicore
 	.pci_ops	= &ssb_pcicore_pciops,
 	.io_resource	= &ssb_pcicore_io_resource,
@ -1098,27 +1189,7 @@
 int ssb_for_each_bus_call(unsigned long data,
 			  int (*func)(struct ssb_bus *bus, unsigned long data))
 {
-@@ -120,6 +142,19 @@ static void ssb_device_put(struct ssb_de
+@@ -190,90 +212,78 @@ int ssb_bus_suspend(struct ssb_bus *bus)
 		put_device(dev->dev);
 }
 +static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 +{
 +	if (drv)
 +		get_driver(&drv->drv);
 +	return drv;
 +}
 +
 +static inline void ssb_driver_put(struct ssb_driver *drv)
 +{
 +	if (drv)
 +		put_driver(&drv->drv);
 +}
 +
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -190,90 +225,81 @@ int ssb_bus_suspend(struct ssb_bus *bus)
 EXPORT_SYMBOL(ssb_bus_suspend);
 #ifdef CONFIG_SSB_SPROM
@ -1176,16 +1247,15 @@
 -			continue;
 -		drv = drv_to_ssb_drv(dev->dev->driver);
 -		if (!drv)
-+		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
+		sdrv = drv_to_ssb_drv(sdev->dev->driver);
-+		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
+		if (SSB_WARN_ON(!sdrv->remove))
 +			ssb_device_put(sdev);
 			continue;
 -		err = drv->suspend(dev, state);
 -		if (err) {
 -			ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n",
 -				   dev_name(dev->dev));
 -			goto err_unwind;
- 		}
+-		}
 +		sdrv->remove(sdev);
 +		ctx->device_frozen[i] = 1;
 	}
@ -1252,7 +1322,6 @@
 +				   dev_name(sdev->dev));
 +			result = err;
 		}
 +		ssb_driver_put(sdrv);
 +		ssb_device_put(sdev);
 	}
@ -1261,7 +1330,7 @@
 }
 #endif /* CONFIG_SSB_SPROM */
-@@ -360,6 +386,35 @@ static int ssb_device_uevent(struct devi
+@@ -360,6 +370,35 @@ static int ssb_device_uevent(struct devi
 			     ssb_dev->id.revision);
 }
@ -1297,7 +1366,7 @@
 static struct bus_type ssb_bustype = {
 	.name		= "ssb",
 	.match		= ssb_bus_match,
-@@ -369,6 +424,7 @@ static struct bus_type ssb_bustype = {
+@@ -369,6 +408,7 @@ static struct bus_type ssb_bustype = {
 	.suspend	= ssb_device_suspend,
 	.resume		= ssb_device_resume,
 	.uevent		= ssb_device_uevent,
@ -1305,7 +1374,7 @@
 };
 static void ssb_buses_lock(void)
-@@ -461,6 +517,7 @@ static int ssb_devices_register(struct s
+@@ -461,6 +501,7 @@ static int ssb_devices_register(struct s
 #ifdef CONFIG_SSB_PCIHOST
 			sdev->irq = bus->host_pci->irq;
 			dev->parent = &bus->host_pci->dev;
@ -1313,7 +1382,7 @@
 #endif
 			break;
 		case SSB_BUSTYPE_PCMCIA:
-@@ -469,8 +526,14 @@ static int ssb_devices_register(struct s
+@@ -469,8 +510,14 @@ static int ssb_devices_register(struct s
 			dev->parent = &bus->host_pcmcia->dev;
 #endif
 			break;
@ -1328,7 +1397,7 @@
 			break;
 		}
-@@ -497,7 +560,7 @@ error:
+@@ -497,7 +544,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -1337,7 +1406,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -708,9 +771,9 @@ out:
+@@ -708,9 +755,9 @@ out:
 	return err;
 }
@ -1350,7 +1419,7 @@
 {
 	int err;
-@@ -724,12 +787,18 @@ static int ssb_bus_register(struct ssb_b
+@@ -724,12 +771,18 @@ static int ssb_bus_register(struct ssb_b
 	err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 1);
 	if (err)
 		goto out;
@ -1370,7 +1439,7 @@
 	/* Init PCI-host device (if any) */
 	err = ssb_pci_init(bus);
-@@ -776,6 +845,8 @@ err_pci_exit:
+@@ -776,6 +829,8 @@ err_pci_exit:
 	ssb_pci_exit(bus);
 err_unmap:
 	ssb_iounmap(bus);
@ -1379,7 +1448,7 @@
 err_disable_xtal:
 	ssb_buses_unlock();
 	ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0);
-@@ -783,8 +854,8 @@ err_disable_xtal:
+@@ -783,8 +838,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -1390,7 +1459,7 @@
 {
 	int err;
-@@ -796,6 +867,9 @@ int ssb_bus_pcibus_register(struct ssb_b
+@@ -796,6 +851,9 @@ int ssb_bus_pcibus_register(struct ssb_b
 	if (!err) {
 		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
 			   "PCI device %s\n", dev_name(&host_pci->dev));
@ -1400,7 +1469,7 @@
 	}
 	return err;
-@@ -804,9 +878,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -804,9 +862,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -1413,7 +1482,7 @@
 {
 	int err;
-@@ -825,9 +899,32 @@ int ssb_bus_pcmciabus_register(struct ss
+@@ -825,9 +883,32 @@ int ssb_bus_pcmciabus_register(struct ss
 EXPORT_SYMBOL(ssb_bus_pcmciabus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -1449,7 +1518,7 @@
 {
 	int err;
-@@ -908,8 +1005,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -908,8 +989,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -1460,7 +1529,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1024,23 +1121,22 @@ static u32 ssb_tmslow_reject_bitmask(str
+@@ -999,6 +1080,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1024,23 +1108,22 @@ static u32 ssb_tmslow_reject_bitmask(str
 {
 	u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
@ -1491,7 +1570,7 @@
 }
 int ssb_device_is_enabled(struct ssb_device *dev)
-@@ -1099,10 +1195,10 @@ void ssb_device_enable(struct ssb_device
+@@ -1099,10 +1182,10 @@ void ssb_device_enable(struct ssb_device
 }
 EXPORT_SYMBOL(ssb_device_enable);
@ -1505,7 +1584,7 @@
 {
 	int i;
 	u32 val;
-@@ -1110,7 +1206,7 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1110,7 +1193,7 @@ static int ssb_wait_bit(struct ssb_devic
 	for (i = 0; i < timeout; i++) {
 		val = ssb_read32(dev, reg);
 		if (set) {
@ -1514,7 +1593,7 @@
 				return 0;
 		} else {
 			if (!(val & bitmask))
-@@ -1127,20 +1223,38 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1127,20 +1210,38 @@ static int ssb_wait_bit(struct ssb_devic
 void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
 {
@ -1562,7 +1641,7 @@
 	ssb_write32(dev, SSB_TMSLOW,
 		    reject | SSB_TMSLOW_RESET |
-@@ -1149,13 +1263,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1149,13 +1250,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -1598,7 +1677,7 @@
 	default:
 		__ssb_dma_not_implemented(dev);
 	}
-@@ -1272,20 +1407,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1272,20 +1394,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
@ -1623,7 +1702,7 @@
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
-@@ -1293,6 +1428,37 @@ error:
+@@ -1293,6 +1415,37 @@ error:
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@ -1661,7 +1740,7 @@
 u32 ssb_admatch_base(u32 adm)
 {
 	u32 base = 0;
-@@ -1358,8 +1524,10 @@ static int __init ssb_modinit(void)
+@@ -1358,8 +1511,10 @@ static int __init ssb_modinit(void)
 	ssb_buses_lock();
 	err = ssb_attach_queued_buses();
 	ssb_buses_unlock();
@ -1673,7 +1752,7 @@
 	err = b43_pci_ssb_bridge_init();
 	if (err) {
-@@ -1375,7 +1543,7 @@ static int __init ssb_modinit(void)
+@@ -1375,7 +1530,7 @@ static int __init ssb_modinit(void)
 		/* don't fail SSB init because of this */
 		err = 0;
 	}
@ -1720,7 +1799,7 @@
 static inline u8 ssb_crc8(u8 crc, u8 data)
 {
-@@ -247,7 +254,7 @@ static int sprom_do_read(struct ssb_bus 
+@@ -247,7 +254,7 @@ static int sprom_do_read(struct ssb_bus
 	int i;
 	for (i = 0; i < bus->sprom_size; i++)
@ -1738,10 +1817,40 @@
 		mmiowb();
 		msleep(20);
 	}
-@@ -399,6 +406,46 @@ static void sprom_extract_r123(struct ss
+@@ -324,7 +331,6 @@ static void sprom_extract_r123(struct ss
- 	out->antenna_gain.ghz5.a3 = gain;
+ {
- }
+ 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -383,20 +389,52 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 +}
 +
 +/* Revs 4 5 and 8 have partially shared layout */
 +static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
 +{
@ -1780,12 +1889,10 @@
 +	     SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
 +	SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
 +	     SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
-+}
+ }
-+
+ 
 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
- {
+@@ -421,10 +459,14 @@ static void sprom_extract_r45(struct ssb
 	int i;
@@ -421,10 +468,14 @@ static void sprom_extract_r45(struct ssb
 		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
 		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
 		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
@ -1800,15 +1907,30 @@
 	}
 	SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
 	     SSB_SPROM4_ANTAVAIL_A_SHIFT);
-@@ -464,22 +515,32 @@ static void sprom_extract_r45(struct ssb
+@@ -453,16 +495,16 @@ static void sprom_extract_r45(struct ssb
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	}
 	       sizeof(out->antenna_gain.ghz5));
-+	sprom_extract_r458(out, in);
+ 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	sprom_extract_r458(out, in);
 	/* TODO - get remaining rev 4 stuff needed */
 }
- 
+@@ -470,16 +512,24 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -1835,7 +1957,7 @@
 	SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
 	     SSB_SPROM8_ANTAVAIL_A_SHIFT);
 	SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
-@@ -490,12 +551,55 @@ static void sprom_extract_r8(struct ssb_
+@@ -490,24 +540,122 @@ static void sprom_extract_r8(struct ssb_
 	SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
 	SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
 	     SSB_SPROM8_ITSSI_A_SHIFT);
@ -1890,11 +2012,21 @@
 +	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	/* Extract the antenna gain values. */
- 	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
+-	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
-@@ -509,6 +613,63 @@ static void sprom_extract_r8(struct ssb_
+	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
- 	       sizeof(out->antenna_gain.ghz5));
+-	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
- 
+	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -1951,11 +2083,10 @@
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 +
 +	sprom_extract_r458(out, in);
-+
+ 
 	/* TODO - get remaining rev 8 stuff needed */
 }
- 
+@@ -521,36 +669,34 @@ static int sprom_extract(struct ssb_bus
@@ -521,36 +682,34 @@ static int sprom_extract(struct ssb_bus 
 	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
 	memset(out->et0mac, 0xFF, 6);		/* preset et0 and et1 mac */
 	memset(out->et1mac, 0xFF, 6);
@ -2013,7 +2144,7 @@
 	}
 	if (out->boardflags_lo == 0xFFFF)
-@@ -564,13 +723,34 @@ static int sprom_extract(struct ssb_bus 
+@@ -564,13 +710,34 @@ static int sprom_extract(struct ssb_bus
 static int ssb_pci_sprom_get(struct ssb_bus *bus,
 			     struct ssb_sprom *sprom)
 {
@ -2051,7 +2182,7 @@
 	bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
 	sprom_do_read(bus, buf);
 	err = sprom_check_crc(buf, bus->sprom_size);
-@@ -580,17 +760,24 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -580,17 +747,24 @@ static int ssb_pci_sprom_get(struct ssb_
 		buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 			      GFP_KERNEL);
 		if (!buf)
@ -2081,7 +2212,7 @@
 				err = 0;
 				goto out_free;
 			}
-@@ -602,19 +789,15 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -602,19 +776,15 @@ static int ssb_pci_sprom_get(struct ssb_
 out_free:
 	kfree(buf);
@ -2188,7 +2319,7 @@
 			   "Could not disable SPROM write access.\n");
 		failed = 1;
 	}
-@@ -617,134 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
+@@ -617,134 +617,136 @@ static int ssb_pcmcia_sprom_check_crc(co
 	}						\
   } while (0)
@ -2268,14 +2399,10 @@
 +	case SSB_PCMCIA_CIS_ANTGAIN:
 +		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 +			"antg tpl size");
-+		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
+		sprom->antenna_gain.a0 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
+		sprom->antenna_gain.a1 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
+		sprom->antenna_gain.a2 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
+		sprom->antenna_gain.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		break;
 +	case SSB_PCMCIA_CIS_BFLAGS:
 +		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
@ -2493,7 +2620,7 @@
 	}
 	bus->mmio = NULL;
 	bus->mapped_device = NULL;
-@@ -230,6 +241,10 @@ static void __iomem *ssb_ioremap(struct 
+@@ -230,6 +241,10 @@ static void __iomem *ssb_ioremap(struct
 		SSB_BUG_ON(1); /* Can't reach this code. */
 #endif
 		break;
@ -2526,7 +2653,17 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
-@@ -339,7 +356,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -303,6 +320,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
@@ -339,7 +359,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 		dev->bus = bus;
 		dev->ops = bus->ops;
@ -2535,7 +2672,7 @@
 			    "Core %d found: %s "
 			    "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
 			    i, ssb_core_name(dev->id.coreid),
-@@ -407,6 +424,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -407,6 +427,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
 			break;
@ -2554,7 +2691,7 @@
 		}
 --- /dev/null
 +++ b/drivers/ssb/sdio.c
-@@ -0,0 +1,610 @@
+@@ -0,0 +1,606 @@
 +/*
 + * Sonics Silicon Backplane
 + * SDIO-Hostbus related functions
@ -3108,14 +3245,10 @@
 +			case SSB_SDIO_CIS_ANTGAIN:
 +				GOTO_ERROR_ON(tuple->size != 2,
 +					      "antg tpl size");
-+				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
+				sprom->antenna_gain.a0 = tuple->data[1];
-+				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
+				sprom->antenna_gain.a1 = tuple->data[1];
-+				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
+				sprom->antenna_gain.a2 = tuple->data[1];
-+				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
+				sprom->antenna_gain.a3 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				break;
 +			case SSB_SDIO_CIS_BFLAGS:
 +				GOTO_ERROR_ON((tuple->size != 3) &&
@ -3413,12 +3546,16 @@
 static inline int b43_pci_ssb_bridge_init(void)
 {
 	return 0;
-@@ -156,6 +205,6 @@ static inline int b43_pci_ssb_bridge_ini
+@@ -156,6 +205,10 @@ static inline int b43_pci_ssb_bridge_ini
 static inline void b43_pci_ssb_bridge_exit(void)
 {
 }
 -#endif /* CONFIG_SSB_PCIHOST */
 +#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/pci_ids.h
@ -3440,23 +3577,26 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,26 +31,64 @@ struct ssb_sprom {
+@@ -25,47 +31,164 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
 -	u8 ant_available_a;	/* A-PHY antenna available bits (up to 4) */
 -	u8 ant_available_bg;	/* B/G-PHY antenna available bits (up to 4) */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 +	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 +	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
@ -3477,10 +3617,10 @@
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_a;		/* A-PHY Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_bg;		/* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 -	u16 boardflags_lo;	/* Boardflags (low 16 bits) */
@ -3493,8 +3633,8 @@
 +	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 +	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 +	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
-+	u8 rxpo2g;		/* 2GHz RX power offset */
+	s8 rxpo2g;		/* 2GHz RX power offset */
-+	u8 rxpo5g;		/* 5GHz RX power offset */
+	s8 rxpo5g;		/* 5GHz RX power offset */
 +	u8 rssisav2g;		/* 2GHz RSSI params */
 +	u8 rssismc2g;
 +	u8 rssismf2g;
@ -3518,8 +3658,15 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
-@@ -58,14 +102,23 @@ struct ssb_sprom {
+ 	 * loss in the connectors is bigger than the gain. */
- 		} ghz5;		/* 5GHz band */
+ 	struct {
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
@ -3532,7 +3679,79 @@
 +		} ghz5;
 +	} fem;
 +
-+	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
 /* Information about the PCB the circuitry is soldered on. */
@ -3544,7 +3763,7 @@
 };
-@@ -137,7 +190,7 @@ struct ssb_device {
+@@ -137,7 +260,7 @@ struct ssb_device {
 	 * is an optimization. */
 	const struct ssb_bus_ops *ops;
@ -3553,7 +3772,7 @@
 	struct ssb_bus *bus;
 	struct ssb_device_id id;
-@@ -195,10 +248,9 @@ struct ssb_driver {
+@@ -195,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -3567,7 +3786,7 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
-@@ -208,6 +260,7 @@ enum ssb_bustype {
+@@ -208,6 +330,7 @@ enum ssb_bustype {
 	SSB_BUSTYPE_SSB,	/* This SSB bus is the system bus */
 	SSB_BUSTYPE_PCI,	/* SSB is connected to PCI bus */
 	SSB_BUSTYPE_PCMCIA,	/* SSB is connected to PCMCIA bus */
@ -3575,7 +3794,7 @@
 };
 /* board_vendor */
-@@ -238,20 +291,33 @@ struct ssb_bus {
+@@ -238,20 +361,33 @@ struct ssb_bus {
 	const struct ssb_bus_ops *ops;
@ -3617,7 +3836,7 @@
 #ifdef CONFIG_SSB_SPROM
 	/* Mutex to protect the SPROM writing. */
-@@ -260,7 +326,8 @@ struct ssb_bus {
+@@ -260,7 +396,8 @@ struct ssb_bus {
 	/* ID information about the Chip. */
 	u16 chip_id;
@ -3627,7 +3846,7 @@
 	u16 sprom_size;		/* number of words in sprom */
 	u8 chip_package;
-@@ -306,6 +373,11 @@ struct ssb_bus {
+@@ -306,6 +443,11 @@ struct ssb_bus {
 #endif /* DEBUG */
 };
@ -3639,7 +3858,7 @@
 /* The initialization-invariants. */
 struct ssb_init_invariants {
 	/* Versioning information about the PCB. */
-@@ -336,12 +408,23 @@ extern int ssb_bus_pcmciabus_register(st
+@@ -336,12 +478,23 @@ extern int ssb_bus_pcmciabus_register(st
 				      struct pcmcia_device *pcmcia_dev,
 				      unsigned long baseaddr);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -3664,7 +3883,7 @@
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
-@@ -612,6 +695,7 @@ extern int ssb_bus_may_powerdown(struct 
+@@ -612,6 +765,7 @@ extern int ssb_bus_may_powerdown(struct
  * Otherwise static always-on powercontrol will be used. */
 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
@ -4304,3 +4523,13 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
--- a/target/linux/generic/patches-2.6.31/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.31/025-bcma_backport.patch
--- a/target/linux/generic/patches-2.6.31/941-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.31/941-ssb_update.patch
@ -225,7 +225,17 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct 
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -28,6 +31,21 @@ static void ssb_chipco_pll_write(struct
 	chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
 }
@ -247,8 +257,39 @@
 struct pmu0_plltab_entry {
 	u16 freq;	/* Crystal frequency in kHz.*/
 	u8 xf;		/* Crystal frequency value for PMU control */
-@@ -317,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
+@@ -76,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -305,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -314,9 +332,19 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 +	case 0x4322:
@ -260,7 +301,7 @@
 	default:
 		ssb_printk(KERN_ERR PFX
 			   "ERROR: PLL init unknown for device %04X\n",
-@@ -396,12 +417,15 @@ static void ssb_pmu_resources_init(struc
+@@ -396,12 +424,15 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -278,7 +319,7 @@
 		/* We keep the default settings:
 		 * min_msk = 0xCBB
 		 * max_msk = 0x7FFFF
-@@ -480,9 +504,9 @@ static void ssb_pmu_resources_init(struc
+@@ -480,9 +511,9 @@ static void ssb_pmu_resources_init(struc
 		chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
 }
@ -289,7 +330,7 @@
 	u32 pmucap;
 	if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
-@@ -494,15 +518,91 @@ void ssb_pmu_init(struct ssb_chipcommon 
+@@ -494,15 +525,122 @@ void ssb_pmu_init(struct ssb_chipcommon
 	ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
 		    cc->pmu.rev, pmucap);
@ -390,6 +431,37 @@
 +
 +EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 +EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_gige.c
 +++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
@ -454,7 +526,17 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
+@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
@@ -270,7 +273,6 @@ void ssb_mipscore_init(struct ssb_mipsco
 				set_irq(dev, irq++);
 			}
 			break;
@ -462,7 +544,7 @@
 		case SSB_DEV_PCI:
 		case SSB_DEV_ETHERNET:
 		case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
+@@ -281,6 +283,10 @@ void ssb_mipscore_init(struct ssb_mipsco
 				set_irq(dev, irq++);
 				break;
 			}
@ -496,6 +578,15 @@
 static inline
 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
@@ -69,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -246,20 +251,12 @@ static struct pci_controller ssb_pcicore
 	.pci_ops	= &ssb_pcicore_pciops,
 	.io_resource	= &ssb_pcicore_io_resource,
@ -955,27 +1046,7 @@
 int ssb_for_each_bus_call(unsigned long data,
 			  int (*func)(struct ssb_bus *bus, unsigned long data))
 {
-@@ -120,6 +142,19 @@ static void ssb_device_put(struct ssb_de
+@@ -190,90 +212,78 @@ int ssb_bus_suspend(struct ssb_bus *bus)
 		put_device(dev->dev);
 }
 +static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 +{
 +	if (drv)
 +		get_driver(&drv->drv);
 +	return drv;
 +}
 +
 +static inline void ssb_driver_put(struct ssb_driver *drv)
 +{
 +	if (drv)
 +		put_driver(&drv->drv);
 +}
 +
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -190,90 +225,81 @@ int ssb_bus_suspend(struct ssb_bus *bus)
 EXPORT_SYMBOL(ssb_bus_suspend);
 #ifdef CONFIG_SSB_SPROM
@ -1033,16 +1104,15 @@
 -			continue;
 -		drv = drv_to_ssb_drv(dev->dev->driver);
 -		if (!drv)
-+		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
+		sdrv = drv_to_ssb_drv(sdev->dev->driver);
-+		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
+		if (SSB_WARN_ON(!sdrv->remove))
 +			ssb_device_put(sdev);
 			continue;
 -		err = drv->suspend(dev, state);
 -		if (err) {
 -			ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n",
 -				   dev_name(dev->dev));
 -			goto err_unwind;
- 		}
+-		}
 +		sdrv->remove(sdev);
 +		ctx->device_frozen[i] = 1;
 	}
@ -1109,7 +1179,6 @@
 +				   dev_name(sdev->dev));
 +			result = err;
 		}
 +		ssb_driver_put(sdrv);
 +		ssb_device_put(sdev);
 	}
@ -1118,7 +1187,7 @@
 }
 #endif /* CONFIG_SSB_SPROM */
-@@ -360,6 +386,35 @@ static int ssb_device_uevent(struct devi
+@@ -360,6 +370,35 @@ static int ssb_device_uevent(struct devi
 			     ssb_dev->id.revision);
 }
@ -1154,7 +1223,7 @@
 static struct bus_type ssb_bustype = {
 	.name		= "ssb",
 	.match		= ssb_bus_match,
-@@ -369,6 +424,7 @@ static struct bus_type ssb_bustype = {
+@@ -369,6 +408,7 @@ static struct bus_type ssb_bustype = {
 	.suspend	= ssb_device_suspend,
 	.resume		= ssb_device_resume,
 	.uevent		= ssb_device_uevent,
@ -1162,7 +1231,7 @@
 };
 static void ssb_buses_lock(void)
-@@ -461,6 +517,7 @@ static int ssb_devices_register(struct s
+@@ -461,6 +501,7 @@ static int ssb_devices_register(struct s
 #ifdef CONFIG_SSB_PCIHOST
 			sdev->irq = bus->host_pci->irq;
 			dev->parent = &bus->host_pci->dev;
@ -1170,7 +1239,7 @@
 #endif
 			break;
 		case SSB_BUSTYPE_PCMCIA:
-@@ -469,8 +526,14 @@ static int ssb_devices_register(struct s
+@@ -469,8 +510,14 @@ static int ssb_devices_register(struct s
 			dev->parent = &bus->host_pcmcia->dev;
 #endif
 			break;
@ -1185,7 +1254,7 @@
 			break;
 		}
-@@ -497,7 +560,7 @@ error:
+@@ -497,7 +544,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -1194,7 +1263,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -708,9 +771,9 @@ out:
+@@ -708,9 +755,9 @@ out:
 	return err;
 }
@ -1207,7 +1276,7 @@
 {
 	int err;
-@@ -724,12 +787,18 @@ static int ssb_bus_register(struct ssb_b
+@@ -724,12 +771,18 @@ static int ssb_bus_register(struct ssb_b
 	err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 1);
 	if (err)
 		goto out;
@ -1227,7 +1296,7 @@
 	/* Init PCI-host device (if any) */
 	err = ssb_pci_init(bus);
-@@ -776,6 +845,8 @@ err_pci_exit:
+@@ -776,6 +829,8 @@ err_pci_exit:
 	ssb_pci_exit(bus);
 err_unmap:
 	ssb_iounmap(bus);
@ -1236,7 +1305,7 @@
 err_disable_xtal:
 	ssb_buses_unlock();
 	ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0);
-@@ -783,8 +854,8 @@ err_disable_xtal:
+@@ -783,8 +838,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -1247,7 +1316,7 @@
 {
 	int err;
-@@ -796,6 +867,9 @@ int ssb_bus_pcibus_register(struct ssb_b
+@@ -796,6 +851,9 @@ int ssb_bus_pcibus_register(struct ssb_b
 	if (!err) {
 		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
 			   "PCI device %s\n", dev_name(&host_pci->dev));
@ -1257,7 +1326,7 @@
 	}
 	return err;
-@@ -804,9 +878,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -804,9 +862,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -1270,7 +1339,7 @@
 {
 	int err;
-@@ -825,9 +899,32 @@ int ssb_bus_pcmciabus_register(struct ss
+@@ -825,9 +883,32 @@ int ssb_bus_pcmciabus_register(struct ss
 EXPORT_SYMBOL(ssb_bus_pcmciabus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -1306,7 +1375,7 @@
 {
 	int err;
-@@ -908,8 +1005,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -908,8 +989,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -1317,7 +1386,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1024,23 +1121,22 @@ static u32 ssb_tmslow_reject_bitmask(str
+@@ -999,6 +1080,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1024,23 +1108,22 @@ static u32 ssb_tmslow_reject_bitmask(str
 {
 	u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
@ -1348,7 +1427,7 @@
 }
 int ssb_device_is_enabled(struct ssb_device *dev)
-@@ -1099,10 +1195,10 @@ void ssb_device_enable(struct ssb_device
+@@ -1099,10 +1182,10 @@ void ssb_device_enable(struct ssb_device
 }
 EXPORT_SYMBOL(ssb_device_enable);
@ -1362,7 +1441,7 @@
 {
 	int i;
 	u32 val;
-@@ -1110,7 +1206,7 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1110,7 +1193,7 @@ static int ssb_wait_bit(struct ssb_devic
 	for (i = 0; i < timeout; i++) {
 		val = ssb_read32(dev, reg);
 		if (set) {
@ -1371,7 +1450,7 @@
 				return 0;
 		} else {
 			if (!(val & bitmask))
-@@ -1127,20 +1223,38 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1127,20 +1210,38 @@ static int ssb_wait_bit(struct ssb_devic
 void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
 {
@ -1419,7 +1498,7 @@
 	ssb_write32(dev, SSB_TMSLOW,
 		    reject | SSB_TMSLOW_RESET |
-@@ -1149,13 +1263,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1149,13 +1250,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -1455,7 +1534,7 @@
 	default:
 		__ssb_dma_not_implemented(dev);
 	}
-@@ -1272,20 +1407,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1272,20 +1394,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
@ -1480,7 +1559,7 @@
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
-@@ -1293,6 +1428,37 @@ error:
+@@ -1293,6 +1415,37 @@ error:
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@ -1518,7 +1597,7 @@
 u32 ssb_admatch_base(u32 adm)
 {
 	u32 base = 0;
-@@ -1358,8 +1524,10 @@ static int __init ssb_modinit(void)
+@@ -1358,8 +1511,10 @@ static int __init ssb_modinit(void)
 	ssb_buses_lock();
 	err = ssb_attach_queued_buses();
 	ssb_buses_unlock();
@ -1530,7 +1609,7 @@
 	err = b43_pci_ssb_bridge_init();
 	if (err) {
-@@ -1375,7 +1543,7 @@ static int __init ssb_modinit(void)
+@@ -1375,7 +1530,7 @@ static int __init ssb_modinit(void)
 		/* don't fail SSB init because of this */
 		err = 0;
 	}
@ -1577,7 +1656,7 @@
 static inline u8 ssb_crc8(u8 crc, u8 data)
 {
-@@ -247,7 +254,7 @@ static int sprom_do_read(struct ssb_bus 
+@@ -247,7 +254,7 @@ static int sprom_do_read(struct ssb_bus
 	int i;
 	for (i = 0; i < bus->sprom_size; i++)
@ -1595,10 +1674,40 @@
 		mmiowb();
 		msleep(20);
 	}
-@@ -399,6 +406,46 @@ static void sprom_extract_r123(struct ss
+@@ -324,7 +331,6 @@ static void sprom_extract_r123(struct ss
- 	out->antenna_gain.ghz5.a3 = gain;
+ {
- }
+ 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -383,20 +389,52 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 +}
 +
 +/* Revs 4 5 and 8 have partially shared layout */
 +static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
 +{
@ -1637,12 +1746,10 @@
 +	     SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
 +	SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
 +	     SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
-+}
+ }
-+
+ 
 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
- {
+@@ -421,10 +459,14 @@ static void sprom_extract_r45(struct ssb
 	int i;
@@ -421,10 +468,14 @@ static void sprom_extract_r45(struct ssb
 		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
 		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
 		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
@ -1657,15 +1764,30 @@
 	}
 	SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
 	     SSB_SPROM4_ANTAVAIL_A_SHIFT);
-@@ -464,22 +515,32 @@ static void sprom_extract_r45(struct ssb
+@@ -453,16 +495,16 @@ static void sprom_extract_r45(struct ssb
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	}
 	       sizeof(out->antenna_gain.ghz5));
-+	sprom_extract_r458(out, in);
+ 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	sprom_extract_r458(out, in);
 	/* TODO - get remaining rev 4 stuff needed */
 }
- 
+@@ -470,16 +512,24 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -1692,7 +1814,7 @@
 	SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
 	     SSB_SPROM8_ANTAVAIL_A_SHIFT);
 	SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
-@@ -490,12 +551,55 @@ static void sprom_extract_r8(struct ssb_
+@@ -490,24 +540,122 @@ static void sprom_extract_r8(struct ssb_
 	SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
 	SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
 	     SSB_SPROM8_ITSSI_A_SHIFT);
@ -1747,11 +1869,21 @@
 +	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	/* Extract the antenna gain values. */
- 	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
+-	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
-@@ -509,6 +613,63 @@ static void sprom_extract_r8(struct ssb_
+	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
- 	       sizeof(out->antenna_gain.ghz5));
+-	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
- 
+	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -1808,11 +1940,10 @@
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 +
 +	sprom_extract_r458(out, in);
-+
+ 
 	/* TODO - get remaining rev 8 stuff needed */
 }
- 
+@@ -521,36 +669,34 @@ static int sprom_extract(struct ssb_bus
@@ -521,36 +682,34 @@ static int sprom_extract(struct ssb_bus 
 	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
 	memset(out->et0mac, 0xFF, 6);		/* preset et0 and et1 mac */
 	memset(out->et1mac, 0xFF, 6);
@ -1870,7 +2001,7 @@
 	}
 	if (out->boardflags_lo == 0xFFFF)
-@@ -564,13 +723,34 @@ static int sprom_extract(struct ssb_bus 
+@@ -564,13 +710,34 @@ static int sprom_extract(struct ssb_bus
 static int ssb_pci_sprom_get(struct ssb_bus *bus,
 			     struct ssb_sprom *sprom)
 {
@ -1908,7 +2039,7 @@
 	bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
 	sprom_do_read(bus, buf);
 	err = sprom_check_crc(buf, bus->sprom_size);
-@@ -580,17 +760,24 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -580,17 +747,24 @@ static int ssb_pci_sprom_get(struct ssb_
 		buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 			      GFP_KERNEL);
 		if (!buf)
@ -1938,7 +2069,7 @@
 				err = 0;
 				goto out_free;
 			}
-@@ -602,19 +789,15 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -602,19 +776,15 @@ static int ssb_pci_sprom_get(struct ssb_
 out_free:
 	kfree(buf);
@ -2027,7 +2158,7 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
-@@ -617,136 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
+@@ -617,136 +617,136 @@ static int ssb_pcmcia_sprom_check_crc(co
 	}						\
   } while (0)
@ -2107,14 +2238,10 @@
 +	case SSB_PCMCIA_CIS_ANTGAIN:
 +		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 +			"antg tpl size");
-+		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
+		sprom->antenna_gain.a0 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
+		sprom->antenna_gain.a1 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
+		sprom->antenna_gain.a2 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
+		sprom->antenna_gain.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		break;
 +	case SSB_PCMCIA_CIS_BFLAGS:
 +		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
@ -2334,7 +2461,7 @@
 	}
 	bus->mmio = NULL;
 	bus->mapped_device = NULL;
-@@ -230,6 +241,10 @@ static void __iomem *ssb_ioremap(struct 
+@@ -230,6 +241,10 @@ static void __iomem *ssb_ioremap(struct
 		SSB_BUG_ON(1); /* Can't reach this code. */
 #endif
 		break;
@ -2367,7 +2494,17 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
-@@ -339,7 +356,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -303,6 +320,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
@@ -339,7 +359,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 		dev->bus = bus;
 		dev->ops = bus->ops;
@ -2376,7 +2513,7 @@
 			    "Core %d found: %s "
 			    "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
 			    i, ssb_core_name(dev->id.coreid),
-@@ -407,6 +424,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -407,6 +427,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
 			break;
@ -2395,7 +2532,7 @@
 		}
 --- /dev/null
 +++ b/drivers/ssb/sdio.c
-@@ -0,0 +1,610 @@
+@@ -0,0 +1,606 @@
 +/*
 + * Sonics Silicon Backplane
 + * SDIO-Hostbus related functions
@ -2949,14 +3086,10 @@
 +			case SSB_SDIO_CIS_ANTGAIN:
 +				GOTO_ERROR_ON(tuple->size != 2,
 +					      "antg tpl size");
-+				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
+				sprom->antenna_gain.a0 = tuple->data[1];
-+				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
+				sprom->antenna_gain.a1 = tuple->data[1];
-+				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
+				sprom->antenna_gain.a2 = tuple->data[1];
-+				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
+				sprom->antenna_gain.a3 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 +				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				break;
 +			case SSB_SDIO_CIS_BFLAGS:
 +				GOTO_ERROR_ON((tuple->size != 3) &&
@ -3221,12 +3354,16 @@
 static inline int b43_pci_ssb_bridge_init(void)
 {
 	return 0;
-@@ -156,6 +205,6 @@ static inline int b43_pci_ssb_bridge_ini
+@@ -156,6 +205,10 @@ static inline int b43_pci_ssb_bridge_ini
 static inline void b43_pci_ssb_bridge_exit(void)
 {
 }
 -#endif /* CONFIG_SSB_PCIHOST */
 +#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/pci_ids.h
@ -3248,23 +3385,26 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,26 +31,64 @@ struct ssb_sprom {
+@@ -25,47 +31,164 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
 -	u8 ant_available_a;	/* A-PHY antenna available bits (up to 4) */
 -	u8 ant_available_bg;	/* B/G-PHY antenna available bits (up to 4) */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 +	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 +	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
@ -3285,10 +3425,10 @@
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_a;		/* A-PHY Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_bg;		/* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
+	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 -	u16 boardflags_lo;	/* Boardflags (low 16 bits) */
@ -3301,8 +3441,8 @@
 +	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 +	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 +	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
-+	u8 rxpo2g;		/* 2GHz RX power offset */
+	s8 rxpo2g;		/* 2GHz RX power offset */
-+	u8 rxpo5g;		/* 5GHz RX power offset */
+	s8 rxpo5g;		/* 5GHz RX power offset */
 +	u8 rssisav2g;		/* 2GHz RSSI params */
 +	u8 rssismc2g;
 +	u8 rssismf2g;
@ -3326,8 +3466,15 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
-@@ -58,14 +102,23 @@ struct ssb_sprom {
+ 	 * loss in the connectors is bigger than the gain. */
- 		} ghz5;		/* 5GHz band */
+ 	struct {
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
@ -3340,7 +3487,79 @@
 +		} ghz5;
 +	} fem;
 +
-+	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
 /* Information about the PCB the circuitry is soldered on. */
@ -3352,7 +3571,7 @@
 };
-@@ -137,7 +190,7 @@ struct ssb_device {
+@@ -137,7 +260,7 @@ struct ssb_device {
 	 * is an optimization. */
 	const struct ssb_bus_ops *ops;
@ -3361,7 +3580,7 @@
 	struct ssb_bus *bus;
 	struct ssb_device_id id;
-@@ -195,10 +248,9 @@ struct ssb_driver {
+@@ -195,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -3375,7 +3594,7 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
-@@ -208,6 +260,7 @@ enum ssb_bustype {
+@@ -208,6 +330,7 @@ enum ssb_bustype {
 	SSB_BUSTYPE_SSB,	/* This SSB bus is the system bus */
 	SSB_BUSTYPE_PCI,	/* SSB is connected to PCI bus */
 	SSB_BUSTYPE_PCMCIA,	/* SSB is connected to PCMCIA bus */
@ -3383,7 +3602,7 @@
 };
 /* board_vendor */
-@@ -238,20 +291,33 @@ struct ssb_bus {
+@@ -238,20 +361,33 @@ struct ssb_bus {
 	const struct ssb_bus_ops *ops;
@ -3425,7 +3644,7 @@
 #ifdef CONFIG_SSB_SPROM
 	/* Mutex to protect the SPROM writing. */
-@@ -260,7 +326,8 @@ struct ssb_bus {
+@@ -260,7 +396,8 @@ struct ssb_bus {
 	/* ID information about the Chip. */
 	u16 chip_id;
@ -3435,7 +3654,7 @@
 	u16 sprom_size;		/* number of words in sprom */
 	u8 chip_package;
-@@ -306,6 +373,11 @@ struct ssb_bus {
+@@ -306,6 +443,11 @@ struct ssb_bus {
 #endif /* DEBUG */
 };
@ -3447,7 +3666,7 @@
 /* The initialization-invariants. */
 struct ssb_init_invariants {
 	/* Versioning information about the PCB. */
-@@ -336,12 +408,23 @@ extern int ssb_bus_pcmciabus_register(st
+@@ -336,12 +478,23 @@ extern int ssb_bus_pcmciabus_register(st
 				      struct pcmcia_device *pcmcia_dev,
 				      unsigned long baseaddr);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -3472,7 +3691,7 @@
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
-@@ -612,6 +695,7 @@ extern int ssb_bus_may_powerdown(struct 
+@@ -612,6 +765,7 @@ extern int ssb_bus_may_powerdown(struct
  * Otherwise static always-on powercontrol will be used. */
 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
@ -4112,3 +4331,13 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
--- a/target/linux/generic/patches-2.6.32/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.32/025-bcma_backport.patch
--- a/target/linux/generic/patches-2.6.32/975-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.32/975-ssb_update.patch
@ -164,8 +164,49 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -332,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -91,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -320,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -329,9 +332,19 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 +	case 0x4322:
@ -177,7 +218,7 @@
 	default:
 		ssb_printk(KERN_ERR PFX
 			   "ERROR: PLL init unknown for device %04X\n",
-@@ -411,12 +417,15 @@ static void ssb_pmu_resources_init(struc
+@@ -411,12 +424,15 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -195,7 +236,7 @@
 		/* We keep the default settings:
 		 * min_msk = 0xCBB
 		 * max_msk = 0x7FFFF
-@@ -495,9 +504,9 @@ static void ssb_pmu_resources_init(struc
+@@ -495,9 +511,9 @@ static void ssb_pmu_resources_init(struc
 		chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
 }
@ -206,7 +247,7 @@
 	u32 pmucap;
 	if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
-@@ -509,15 +518,12 @@ void ssb_pmu_init(struct ssb_chipcommon
+@@ -509,15 +525,12 @@ void ssb_pmu_init(struct ssb_chipcommon
 	ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
 		    cc->pmu.rev, pmucap);
@ -228,6 +269,41 @@
 	ssb_pmu_pll_init(cc);
 	ssb_pmu_resources_init(cc);
 }
@@ -600,3 +613,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_gige.c
 +++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
@ -292,7 +368,17 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
+@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
@@ -270,7 +273,6 @@ void ssb_mipscore_init(struct ssb_mipsco
 				set_irq(dev, irq++);
 			}
 			break;
@ -300,7 +386,7 @@
 		case SSB_DEV_PCI:
 		case SSB_DEV_ETHERNET:
 		case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
+@@ -281,6 +283,10 @@ void ssb_mipscore_init(struct ssb_mipsco
 				set_irq(dev, irq++);
 				break;
 			}
@ -334,6 +420,15 @@
 static inline
 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
@@ -69,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -246,20 +251,12 @@ static struct pci_controller ssb_pcicore
 	.pci_ops	= &ssb_pcicore_pciops,
 	.io_resource	= &ssb_pcicore_io_resource,
@ -767,27 +862,7 @@
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
-@@ -140,6 +142,19 @@ static void ssb_device_put(struct ssb_de
+@@ -210,90 +212,78 @@ int ssb_bus_suspend(struct ssb_bus *bus)
 		put_device(dev->dev);
 }
 +static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 +{
 +	if (drv)
 +		get_driver(&drv->drv);
 +	return drv;
 +}
 +
 +static inline void ssb_driver_put(struct ssb_driver *drv)
 +{
 +	if (drv)
 +		put_driver(&drv->drv);
 +}
 +
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -210,90 +225,81 @@ int ssb_bus_suspend(struct ssb_bus *bus)
 EXPORT_SYMBOL(ssb_bus_suspend);
 #ifdef CONFIG_SSB_SPROM
@ -842,19 +917,18 @@
 -		if (!dev->dev ||
 -		    !dev->dev->driver ||
 -		    !device_is_registered(dev->dev))
-+		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
+-			continue;
 +		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 +			ssb_device_put(sdev);
 			continue;
 -		drv = drv_to_ssb_drv(dev->dev->driver);
 -		if (!drv)
-			continue;
+		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		err = drv->suspend(dev, state);
 -		if (err) {
 -			ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n",
 -				   dev_name(dev->dev));
 -			goto err_unwind;
- 		}
+-		}
 +		sdrv->remove(sdev);
 +		ctx->device_frozen[i] = 1;
 	}
@ -921,7 +995,6 @@
 +				   dev_name(sdev->dev));
 +			result = err;
 		}
 +		ssb_driver_put(sdrv);
 +		ssb_device_put(sdev);
 	}
@ -930,7 +1003,7 @@
 }
 #endif /* CONFIG_SSB_SPROM */
-@@ -380,6 +386,35 @@ static int ssb_device_uevent(struct devi
+@@ -380,6 +370,35 @@ static int ssb_device_uevent(struct devi
 			     ssb_dev->id.revision);
 }
@ -966,7 +1039,7 @@
 static struct bus_type ssb_bustype = {
 	.name		= "ssb",
 	.match		= ssb_bus_match,
-@@ -389,6 +424,7 @@ static struct bus_type ssb_bustype = {
+@@ -389,6 +408,7 @@ static struct bus_type ssb_bustype = {
 	.suspend	= ssb_device_suspend,
 	.resume		= ssb_device_resume,
 	.uevent		= ssb_device_uevent,
@ -974,7 +1047,7 @@
 };
 static void ssb_buses_lock(void)
-@@ -481,6 +517,7 @@ static int ssb_devices_register(struct s
+@@ -481,6 +501,7 @@ static int ssb_devices_register(struct s
 #ifdef CONFIG_SSB_PCIHOST
 			sdev->irq = bus->host_pci->irq;
 			dev->parent = &bus->host_pci->dev;
@ -982,7 +1055,7 @@
 #endif
 			break;
 		case SSB_BUSTYPE_PCMCIA:
-@@ -490,13 +527,13 @@ static int ssb_devices_register(struct s
+@@ -490,13 +511,13 @@ static int ssb_devices_register(struct s
 #endif
 			break;
 		case SSB_BUSTYPE_SDIO:
@ -998,7 +1071,7 @@
 			break;
 		}
-@@ -523,7 +560,7 @@ error:
+@@ -523,7 +544,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -1007,7 +1080,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -734,9 +771,9 @@ out:
+@@ -734,9 +755,9 @@ out:
 	return err;
 }
@ -1020,7 +1093,7 @@
 {
 	int err;
-@@ -817,8 +854,8 @@ err_disable_xtal:
+@@ -817,8 +838,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -1031,7 +1104,7 @@
 {
 	int err;
-@@ -830,6 +867,9 @@ int ssb_bus_pcibus_register(struct ssb_b
+@@ -830,6 +851,9 @@ int ssb_bus_pcibus_register(struct ssb_b
 	if (!err) {
 		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
 			   "PCI device %s\n", dev_name(&host_pci->dev));
@ -1041,7 +1114,7 @@
 	}
 	return err;
-@@ -838,9 +878,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -838,9 +862,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -1054,7 +1127,7 @@
 {
 	int err;
-@@ -860,8 +900,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
+@@ -860,8 +884,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
 #endif /* CONFIG_SSB_PCMCIAHOST */
 #ifdef CONFIG_SSB_SDIOHOST
@ -1066,7 +1139,7 @@
 {
 	int err;
-@@ -881,9 +922,9 @@ int ssb_bus_sdiobus_register(struct ssb_
+@@ -881,9 +906,9 @@ int ssb_bus_sdiobus_register(struct ssb_
 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -1079,7 +1152,7 @@
 {
 	int err;
-@@ -964,8 +1005,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -964,8 +989,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -1090,7 +1163,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1080,23 +1121,22 @@ static u32 ssb_tmslow_reject_bitmask(str
+@@ -1055,6 +1080,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1080,23 +1108,22 @@ static u32 ssb_tmslow_reject_bitmask(str
 {
 	u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
@ -1121,7 +1204,7 @@
 }
 int ssb_device_is_enabled(struct ssb_device *dev)
-@@ -1155,10 +1195,10 @@ void ssb_device_enable(struct ssb_device
+@@ -1155,10 +1182,10 @@ void ssb_device_enable(struct ssb_device
 }
 EXPORT_SYMBOL(ssb_device_enable);
@ -1135,7 +1218,7 @@
 {
 	int i;
 	u32 val;
-@@ -1166,7 +1206,7 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1166,7 +1193,7 @@ static int ssb_wait_bit(struct ssb_devic
 	for (i = 0; i < timeout; i++) {
 		val = ssb_read32(dev, reg);
 		if (set) {
@ -1144,7 +1227,7 @@
 				return 0;
 		} else {
 			if (!(val & bitmask))
-@@ -1183,20 +1223,38 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1183,20 +1210,38 @@ static int ssb_wait_bit(struct ssb_devic
 void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
 {
@ -1192,7 +1275,7 @@
 	ssb_write32(dev, SSB_TMSLOW,
 		    reject | SSB_TMSLOW_RESET |
-@@ -1205,13 +1263,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1205,13 +1250,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -1228,7 +1311,7 @@
 	default:
 		__ssb_dma_not_implemented(dev);
 	}
-@@ -1328,20 +1407,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1328,20 +1394,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
@ -1253,7 +1336,7 @@
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
-@@ -1349,6 +1428,37 @@ error:
+@@ -1349,6 +1415,37 @@ error:
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@ -1319,10 +1402,40 @@
 /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
 #define SPEX16(_outvar, _offset, _mask, _shift)	\
 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-@@ -405,6 +406,46 @@ static void sprom_extract_r123(struct ss
+@@ -330,7 +331,6 @@ static void sprom_extract_r123(struct ss
- 	out->antenna_gain.ghz5.a3 = gain;
+ {
- }
+ 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -389,20 +389,52 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 +}
 +
 +/* Revs 4 5 and 8 have partially shared layout */
 +static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
 +{
@ -1361,12 +1474,10 @@
 +	     SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
 +	SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
 +	     SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
-+}
+ }
-+
+ 
 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
- {
+@@ -427,10 +459,14 @@ static void sprom_extract_r45(struct ssb
 	int i;
@@ -427,10 +468,14 @@ static void sprom_extract_r45(struct ssb
 		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
 		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
 		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
@ -1381,15 +1492,30 @@
 	}
 	SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
 	     SSB_SPROM4_ANTAVAIL_A_SHIFT);
-@@ -470,13 +515,21 @@ static void sprom_extract_r45(struct ssb
+@@ -459,16 +495,16 @@ static void sprom_extract_r45(struct ssb
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	}
 	       sizeof(out->antenna_gain.ghz5));
-+	sprom_extract_r458(out, in);
+ 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	sprom_extract_r458(out, in);
 	/* TODO - get remaining rev 4 stuff needed */
 }
- 
+@@ -476,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -1404,10 +1530,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -560,6 +613,63 @@ static void sprom_extract_r8(struct ssb_
+@@ -549,16 +591,71 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -1464,11 +1605,10 @@
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 +
 +	sprom_extract_r458(out, in);
-+
+ 
 	/* TODO - get remaining rev 8 stuff needed */
 }
- 
+@@ -572,37 +669,34 @@ static int sprom_extract(struct ssb_bus
@@ -572,37 +682,34 @@ static int sprom_extract(struct ssb_bus
 	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
 	memset(out->et0mac, 0xFF, 6);		/* preset et0 and et1 mac */
 	memset(out->et1mac, 0xFF, 6);
@ -1527,7 +1667,7 @@
 	}
 	if (out->boardflags_lo == 0xFFFF)
-@@ -616,15 +723,14 @@ static int sprom_extract(struct ssb_bus
+@@ -616,15 +710,14 @@ static int sprom_extract(struct ssb_bus
 static int ssb_pci_sprom_get(struct ssb_bus *bus,
 			     struct ssb_sprom *sprom)
 {
@ -1545,7 +1685,7 @@
 		/*
 		 * get SPROM offset: SSB_SPROM_BASE1 except for
 		 * chipcommon rev >= 31 or chip ID is 0x4312 and
-@@ -644,7 +750,7 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -644,7 +737,7 @@ static int ssb_pci_sprom_get(struct ssb_
 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
 	if (!buf)
@ -1554,7 +1694,7 @@
 	bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
 	sprom_do_read(bus, buf);
 	err = sprom_check_crc(buf, bus->sprom_size);
-@@ -654,17 +760,24 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -654,17 +747,24 @@ static int ssb_pci_sprom_get(struct ssb_
 		buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 			      GFP_KERNEL);
 		if (!buf)
@ -1584,7 +1724,7 @@
 				err = 0;
 				goto out_free;
 			}
-@@ -676,19 +789,15 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -676,19 +776,15 @@ static int ssb_pci_sprom_get(struct ssb_
 out_free:
 	kfree(buf);
@ -1673,7 +1813,7 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
-@@ -617,136 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
+@@ -617,136 +617,136 @@ static int ssb_pcmcia_sprom_check_crc(co
 	}						\
   } while (0)
@ -1753,14 +1893,10 @@
 +	case SSB_PCMCIA_CIS_ANTGAIN:
 +		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 +			"antg tpl size");
-+		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
+		sprom->antenna_gain.a0 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
+		sprom->antenna_gain.a1 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
+		sprom->antenna_gain.a2 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
+		sprom->antenna_gain.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		break;
 +	case SSB_PCMCIA_CIS_BFLAGS:
 +		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
@ -1961,7 +2097,17 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
-@@ -354,7 +356,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -318,6 +320,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
@@ -354,7 +359,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 		dev->bus = bus;
 		dev->ops = bus->ops;
@ -1970,7 +2116,7 @@
 			    "Core %d found: %s "
 			    "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
 			    i, ssb_core_name(dev->id.coreid),
-@@ -422,6 +424,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -422,6 +427,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
 			break;
@ -2151,12 +2297,16 @@
 static inline int b43_pci_ssb_bridge_init(void)
 {
 	return 0;
-@@ -196,6 +205,6 @@ static inline int b43_pci_ssb_bridge_ini
+@@ -196,6 +205,10 @@ static inline int b43_pci_ssb_bridge_ini
 static inline void b43_pci_ssb_bridge_exit(void)
 {
 }
 -#endif /* CONFIG_SSB_PCIHOST */
 +#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb.h
@ -2168,36 +2318,57 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,8 +31,10 @@ struct ssb_sprom {
+@@ -25,8 +31,13 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
-@@ -55,6 +63,10 @@ struct ssb_sprom {
+@@ -45,18 +56,22 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
 	u8 tri5gl;		/* 5.2GHz TX isolation */
 	u8 tri5g;		/* 5.3GHz TX isolation */
 	u8 tri5gh;		/* 5.8GHz TX isolation */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	u8 txpid2g[4];		/* 2GHz TX power index */
 +	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 +	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 +	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
- 	u8 rxpo2g;		/* 2GHz RX power offset */
+	s8 rxpo2g;		/* 2GHz RX power offset */
- 	u8 rxpo5g;		/* 5GHz RX power offset */
+	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
-@@ -76,6 +88,8 @@ struct ssb_sprom {
+ 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -76,26 +91,104 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -2206,10 +2377,17 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -88,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+-		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	struct {
 +		struct {
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
@ -2219,10 +2397,82 @@
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
-@@ -95,7 +118,7 @@ struct ssb_sprom {
+ /* Information about the PCB the circuitry is soldered on. */
 struct ssb_boardinfo {
 	u16 vendor;
 	u16 type;
@ -2231,7 +2481,7 @@
 };
-@@ -167,7 +190,7 @@ struct ssb_device {
+@@ -167,7 +260,7 @@ struct ssb_device {
 	 * is an optimization. */
 	const struct ssb_bus_ops *ops;
@ -2240,7 +2490,7 @@
 	struct ssb_bus *bus;
 	struct ssb_device_id id;
-@@ -225,10 +248,9 @@ struct ssb_driver {
+@@ -225,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -2254,7 +2504,7 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
-@@ -269,7 +291,8 @@ struct ssb_bus {
+@@ -269,7 +361,8 @@ struct ssb_bus {
 	const struct ssb_bus_ops *ops;
@ -2264,7 +2514,7 @@
 	struct ssb_device *mapped_device;
 	union {
 		/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
-@@ -281,14 +304,17 @@ struct ssb_bus {
+@@ -281,14 +374,17 @@ struct ssb_bus {
 	 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
 	spinlock_t bar_lock;
@ -2289,7 +2539,7 @@
 	/* See enum ssb_quirks */
 	unsigned int quirks;
-@@ -300,7 +326,7 @@ struct ssb_bus {
+@@ -300,7 +396,7 @@ struct ssb_bus {
 	/* ID information about the Chip. */
 	u16 chip_id;
@ -2298,7 +2548,7 @@
 	u16 sprom_offset;
 	u16 sprom_size;		/* number of words in sprom */
 	u8 chip_package;
-@@ -396,7 +422,9 @@ extern bool ssb_is_sprom_available(struc
+@@ -396,7 +492,9 @@ extern bool ssb_is_sprom_available(struc
 /* Set a fallback SPROM.
  * See kdoc at the function definition for complete documentation. */
@ -2309,7 +2559,7 @@
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
-@@ -667,6 +695,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -667,6 +765,7 @@ extern int ssb_bus_may_powerdown(struct
  * Otherwise static always-on powercontrol will be used. */
 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
@ -2930,3 +3180,32 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  *
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
--- a/target/linux/generic/patches-2.6.36/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.36/025-bcma_backport.patch
--- a/target/linux/generic/patches-2.6.36/941-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.36/941-ssb_update.patch
@ -17,7 +17,49 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_gige.h>
-@@ -384,6 +385,35 @@ static int ssb_device_uevent(struct devi
+@@ -140,19 +141,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -250,11 +238,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -293,7 +279,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -384,6 +369,35 @@ static int ssb_device_uevent(struct devi
 			     ssb_dev->id.revision);
 }
@ -53,7 +95,7 @@
 static struct bus_type ssb_bustype = {
 	.name		= "ssb",
 	.match		= ssb_bus_match,
-@@ -393,6 +423,7 @@ static struct bus_type ssb_bustype = {
+@@ -393,6 +407,7 @@ static struct bus_type ssb_bustype = {
 	.suspend	= ssb_device_suspend,
 	.resume		= ssb_device_resume,
 	.uevent		= ssb_device_uevent,
@ -61,7 +103,7 @@
 };
 static void ssb_buses_lock(void)
-@@ -528,7 +559,7 @@ error:
+@@ -528,7 +543,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -70,7 +112,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -739,9 +770,9 @@ out:
+@@ -739,9 +754,9 @@ out:
 	return err;
 }
@ -83,7 +125,7 @@
 {
 	int err;
-@@ -822,8 +853,8 @@ err_disable_xtal:
+@@ -822,8 +837,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -94,7 +136,7 @@
 {
 	int err;
-@@ -846,9 +877,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -846,9 +861,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -107,7 +149,7 @@
 {
 	int err;
-@@ -868,8 +899,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
+@@ -868,8 +883,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
 #endif /* CONFIG_SSB_PCMCIAHOST */
 #ifdef CONFIG_SSB_SDIOHOST
@ -119,7 +161,7 @@
 {
 	int err;
-@@ -889,9 +921,9 @@ int ssb_bus_sdiobus_register(struct ssb_
+@@ -889,9 +905,9 @@ int ssb_bus_sdiobus_register(struct ssb_
 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -132,7 +174,7 @@
 {
 	int err;
-@@ -972,8 +1004,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -972,8 +988,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -143,7 +185,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1088,23 +1120,22 @@ static u32 ssb_tmslow_reject_bitmask(str
+@@ -1063,6 +1079,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1088,23 +1107,22 @@ static u32 ssb_tmslow_reject_bitmask(str
 {
 	u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
@ -174,7 +226,7 @@
 }
 int ssb_device_is_enabled(struct ssb_device *dev)
-@@ -1163,10 +1194,10 @@ void ssb_device_enable(struct ssb_device
+@@ -1163,10 +1181,10 @@ void ssb_device_enable(struct ssb_device
 }
 EXPORT_SYMBOL(ssb_device_enable);
@ -188,7 +240,7 @@
 {
 	int i;
 	u32 val;
-@@ -1174,7 +1205,7 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1174,7 +1192,7 @@ static int ssb_wait_bit(struct ssb_devic
 	for (i = 0; i < timeout; i++) {
 		val = ssb_read32(dev, reg);
 		if (set) {
@ -197,7 +249,7 @@
 				return 0;
 		} else {
 			if (!(val & bitmask))
-@@ -1191,20 +1222,38 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1191,20 +1209,38 @@ static int ssb_wait_bit(struct ssb_devic
 void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
 {
@ -245,7 +297,7 @@
 	ssb_write32(dev, SSB_TMSLOW,
 		    reject | SSB_TMSLOW_RESET |
-@@ -1213,13 +1262,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1213,13 +1249,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -281,7 +333,7 @@
 	default:
 		__ssb_dma_not_implemented(dev);
 	}
-@@ -1262,20 +1332,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1262,20 +1319,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
@ -306,7 +358,7 @@
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
-@@ -1283,6 +1353,37 @@ error:
+@@ -1283,6 +1340,37 @@ error:
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@ -355,10 +407,40 @@
  * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
  * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
  * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
-@@ -406,6 +406,46 @@ static void sprom_extract_r123(struct ss
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
- 	out->antenna_gain.ghz5.a3 = gain;
+ {
- }
+ 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,52 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 +}
 +
 +/* Revs 4 5 and 8 have partially shared layout */
 +static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
 +{
@ -397,12 +479,10 @@
 +	     SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
 +	SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
 +	     SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
-+}
+ }
-+
+ 
 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
- {
+@@ -428,10 +459,14 @@ static void sprom_extract_r45(struct ssb
 	int i;
@@ -428,10 +468,14 @@ static void sprom_extract_r45(struct ssb
 		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
 		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
 		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
@ -417,15 +497,30 @@
 	}
 	SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
 	     SSB_SPROM4_ANTAVAIL_A_SHIFT);
-@@ -471,13 +515,21 @@ static void sprom_extract_r45(struct ssb
+@@ -460,16 +495,16 @@ static void sprom_extract_r45(struct ssb
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	}
 	       sizeof(out->antenna_gain.ghz5));
-+	sprom_extract_r458(out, in);
+ 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	sprom_extract_r458(out, in);
 	/* TODO - get remaining rev 4 stuff needed */
 }
- 
+@@ -477,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -440,10 +535,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -561,6 +613,63 @@ static void sprom_extract_r8(struct ssb_
+@@ -550,16 +591,71 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -500,11 +610,10 @@
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 +
 +	sprom_extract_r458(out, in);
-+
+ 
 	/* TODO - get remaining rev 8 stuff needed */
 }
- 
+@@ -573,37 +669,34 @@ static int sprom_extract(struct ssb_bus
@@ -573,37 +682,34 @@ static int sprom_extract(struct ssb_bus
 	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
 	memset(out->et0mac, 0xFF, 6);		/* preset et0 and et1 mac */
 	memset(out->et1mac, 0xFF, 6);
@ -563,7 +672,7 @@
 	}
 	if (out->boardflags_lo == 0xFFFF)
-@@ -617,15 +723,14 @@ static int sprom_extract(struct ssb_bus
+@@ -617,15 +710,14 @@ static int sprom_extract(struct ssb_bus
 static int ssb_pci_sprom_get(struct ssb_bus *bus,
 			     struct ssb_sprom *sprom)
 {
@ -581,7 +690,7 @@
 		/*
 		 * get SPROM offset: SSB_SPROM_BASE1 except for
 		 * chipcommon rev >= 31 or chip ID is 0x4312 and
-@@ -645,7 +750,7 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -645,7 +737,7 @@ static int ssb_pci_sprom_get(struct ssb_
 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
 	if (!buf)
@ -590,7 +699,7 @@
 	bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
 	sprom_do_read(bus, buf);
 	err = sprom_check_crc(buf, bus->sprom_size);
-@@ -655,17 +760,24 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -655,17 +747,24 @@ static int ssb_pci_sprom_get(struct ssb_
 		buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 			      GFP_KERNEL);
 		if (!buf)
@ -620,7 +729,7 @@
 				err = 0;
 				goto out_free;
 			}
-@@ -677,19 +789,15 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -677,19 +776,15 @@ static int ssb_pci_sprom_get(struct ssb_
 out_free:
 	kfree(buf);
@ -725,7 +834,17 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
-@@ -406,10 +408,10 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -317,6 +319,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
@@ -406,10 +411,10 @@ int ssb_bus_scan(struct ssb_bus *bus,
 				/* Ignore PCI cores on PCI-E cards.
 				 * Ignore PCI-E cores on PCI cards. */
 				if (dev->id.coreid == SSB_DEV_PCI) {
@ -738,7 +857,7 @@
 						continue;
 				}
 			}
-@@ -421,6 +423,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -421,6 +426,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
 			break;
@ -764,36 +883,57 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,8 +31,10 @@ struct ssb_sprom {
+@@ -25,8 +31,13 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
-@@ -55,6 +63,10 @@ struct ssb_sprom {
+@@ -45,18 +56,22 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
 	u8 tri5gl;		/* 5.2GHz TX isolation */
 	u8 tri5g;		/* 5.3GHz TX isolation */
 	u8 tri5gh;		/* 5.8GHz TX isolation */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	u8 txpid2g[4];		/* 2GHz TX power index */
 +	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 +	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 +	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
- 	u8 rxpo2g;		/* 2GHz RX power offset */
+	s8 rxpo2g;		/* 2GHz RX power offset */
- 	u8 rxpo5g;		/* 5GHz RX power offset */
+	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
-@@ -76,6 +88,8 @@ struct ssb_sprom {
+ 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -76,26 +91,104 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -802,10 +942,17 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -88,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+-		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	struct {
 +		struct {
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
@ -815,10 +962,82 @@
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
-@@ -95,7 +118,7 @@ struct ssb_sprom {
+ /* Information about the PCB the circuitry is soldered on. */
 struct ssb_boardinfo {
 	u16 vendor;
 	u16 type;
@ -827,7 +1046,7 @@
 };
-@@ -225,10 +248,9 @@ struct ssb_driver {
+@@ -225,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -841,7 +1060,7 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
-@@ -304,7 +326,7 @@ struct ssb_bus {
+@@ -304,7 +396,7 @@ struct ssb_bus {
 	/* ID information about the Chip. */
 	u16 chip_id;
@ -850,7 +1069,7 @@
 	u16 sprom_offset;
 	u16 sprom_size;		/* number of words in sprom */
 	u8 chip_package;
-@@ -400,7 +422,9 @@ extern bool ssb_is_sprom_available(struc
+@@ -400,7 +492,9 @@ extern bool ssb_is_sprom_available(struc
 /* Set a fallback SPROM.
  * See kdoc at the function definition for complete documentation. */
@ -861,7 +1080,7 @@
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
-@@ -514,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -514,6 +608,7 @@ extern int ssb_bus_may_powerdown(struct
  * Otherwise static always-on powercontrol will be used. */
 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
@ -871,7 +1090,15 @@
 extern u32 ssb_admatch_base(u32 adm);
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
-@@ -96,16 +96,21 @@ static inline bool ssb_gige_must_flush_p
+@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
@@ -96,16 +97,21 @@ static inline bool ssb_gige_must_flush_p
 	return 0;
 }
@ -1215,7 +1442,53 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -417,12 +417,14 @@ static void ssb_pmu_resources_init(struc
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -91,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -320,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -329,7 +332,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -417,12 +424,14 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -1232,6 +1505,41 @@
 	case 0x4322:
 		/* We keep the default settings:
 		 * min_msk = 0xCBB
@@ -604,3 +613,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_gige.c
 +++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
@ -1300,6 +1608,15 @@
 static inline
 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
@@ -69,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -309,7 +314,7 @@ int ssb_pcicore_pcibios_map_irq(const st
 	return ssb_mips_irq(extpci_core->dev) + 2;
 }
@ -1746,6 +2063,15 @@
 /* core.c */
@@ -206,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb_driver_chipcommon.h
 +++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -8,7 +8,7 @@
@ -1828,6 +2154,16 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/embedded.c
 +++ b/drivers/ssb/embedded.c
@@ -3,7 +3,7 @@
@ -1850,6 +2186,25 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -677,14 +677,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -6,7 +6,7 @@
@ -1861,3 +2216,22 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  *
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
--- a/target/linux/generic/patches-2.6.37/020-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.37/020-ssb_update.patch
@ -17,7 +17,49 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_gige.h>
-@@ -383,6 +384,35 @@ static int ssb_device_uevent(struct devi
+@@ -139,19 +140,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -249,11 +237,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -292,7 +278,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -383,6 +368,35 @@ static int ssb_device_uevent(struct devi
 			     ssb_dev->id.revision);
 }
@ -53,7 +95,7 @@
 static struct bus_type ssb_bustype = {
 	.name		= "ssb",
 	.match		= ssb_bus_match,
-@@ -392,6 +422,7 @@ static struct bus_type ssb_bustype = {
+@@ -392,6 +406,7 @@ static struct bus_type ssb_bustype = {
 	.suspend	= ssb_device_suspend,
 	.resume		= ssb_device_resume,
 	.uevent		= ssb_device_uevent,
@ -61,7 +103,7 @@
 };
 static void ssb_buses_lock(void)
-@@ -527,7 +558,7 @@ error:
+@@ -527,7 +542,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -70,7 +112,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -738,9 +769,9 @@ out:
+@@ -738,9 +753,9 @@ out:
 	return err;
 }
@ -83,7 +125,7 @@
 {
 	int err;
-@@ -821,8 +852,8 @@ err_disable_xtal:
+@@ -821,8 +836,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -94,7 +136,7 @@
 {
 	int err;
-@@ -845,9 +876,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -845,9 +860,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -107,7 +149,7 @@
 {
 	int err;
-@@ -867,8 +898,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
+@@ -867,8 +882,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
 #endif /* CONFIG_SSB_PCMCIAHOST */
 #ifdef CONFIG_SSB_SDIOHOST
@ -119,7 +161,7 @@
 {
 	int err;
-@@ -888,9 +920,9 @@ int ssb_bus_sdiobus_register(struct ssb_
+@@ -888,9 +904,9 @@ int ssb_bus_sdiobus_register(struct ssb_
 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -132,7 +174,7 @@
 {
 	int err;
-@@ -971,8 +1003,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -971,8 +987,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -143,7 +185,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1087,23 +1119,22 @@ static u32 ssb_tmslow_reject_bitmask(str
+@@ -1062,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1087,23 +1106,22 @@ static u32 ssb_tmslow_reject_bitmask(str
 {
 	u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
@ -174,7 +226,7 @@
 }
 int ssb_device_is_enabled(struct ssb_device *dev)
-@@ -1162,10 +1193,10 @@ void ssb_device_enable(struct ssb_device
+@@ -1162,10 +1180,10 @@ void ssb_device_enable(struct ssb_device
 }
 EXPORT_SYMBOL(ssb_device_enable);
@ -188,7 +240,7 @@
 {
 	int i;
 	u32 val;
-@@ -1173,7 +1204,7 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1173,7 +1191,7 @@ static int ssb_wait_bit(struct ssb_devic
 	for (i = 0; i < timeout; i++) {
 		val = ssb_read32(dev, reg);
 		if (set) {
@ -197,7 +249,7 @@
 				return 0;
 		} else {
 			if (!(val & bitmask))
-@@ -1190,20 +1221,38 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1190,20 +1208,38 @@ static int ssb_wait_bit(struct ssb_devic
 void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
 {
@ -245,7 +297,7 @@
 	ssb_write32(dev, SSB_TMSLOW,
 		    reject | SSB_TMSLOW_RESET |
-@@ -1212,13 +1261,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1212,13 +1248,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -281,7 +333,7 @@
 	default:
 		__ssb_dma_not_implemented(dev);
 	}
-@@ -1261,20 +1331,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1261,20 +1318,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
@ -306,7 +358,7 @@
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
-@@ -1282,6 +1352,37 @@ error:
+@@ -1282,6 +1339,37 @@ error:
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@ -355,10 +407,40 @@
  * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
  * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
  * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
-@@ -406,6 +406,46 @@ static void sprom_extract_r123(struct ss
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
- 	out->antenna_gain.ghz5.a3 = gain;
+ {
- }
+ 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,52 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 +}
 +
 +/* Revs 4 5 and 8 have partially shared layout */
 +static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
 +{
@ -397,12 +479,10 @@
 +	     SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
 +	SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
 +	     SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
-+}
+ }
-+
+ 
 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
- {
+@@ -428,10 +459,14 @@ static void sprom_extract_r45(struct ssb
 	int i;
@@ -428,10 +468,14 @@ static void sprom_extract_r45(struct ssb
 		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
 		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
 		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
@ -417,15 +497,30 @@
 	}
 	SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
 	     SSB_SPROM4_ANTAVAIL_A_SHIFT);
-@@ -471,13 +515,21 @@ static void sprom_extract_r45(struct ssb
+@@ -460,16 +495,16 @@ static void sprom_extract_r45(struct ssb
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	}
 	       sizeof(out->antenna_gain.ghz5));
-+	sprom_extract_r458(out, in);
+ 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	sprom_extract_r458(out, in);
 	/* TODO - get remaining rev 4 stuff needed */
 }
- 
+@@ -477,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -440,10 +535,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -561,6 +613,63 @@ static void sprom_extract_r8(struct ssb_
+@@ -550,16 +591,71 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -500,11 +610,10 @@
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 +
 +	sprom_extract_r458(out, in);
-+
+ 
 	/* TODO - get remaining rev 8 stuff needed */
 }
- 
+@@ -573,37 +669,34 @@ static int sprom_extract(struct ssb_bus
@@ -573,37 +682,34 @@ static int sprom_extract(struct ssb_bus
 	ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
 	memset(out->et0mac, 0xFF, 6);		/* preset et0 and et1 mac */
 	memset(out->et1mac, 0xFF, 6);
@ -563,7 +672,7 @@
 	}
 	if (out->boardflags_lo == 0xFFFF)
-@@ -617,15 +723,14 @@ static int sprom_extract(struct ssb_bus
+@@ -617,15 +710,14 @@ static int sprom_extract(struct ssb_bus
 static int ssb_pci_sprom_get(struct ssb_bus *bus,
 			     struct ssb_sprom *sprom)
 {
@ -581,7 +690,7 @@
 		/*
 		 * get SPROM offset: SSB_SPROM_BASE1 except for
 		 * chipcommon rev >= 31 or chip ID is 0x4312 and
-@@ -645,7 +750,7 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -645,7 +737,7 @@ static int ssb_pci_sprom_get(struct ssb_
 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
 	if (!buf)
@ -590,7 +699,7 @@
 	bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
 	sprom_do_read(bus, buf);
 	err = sprom_check_crc(buf, bus->sprom_size);
-@@ -655,17 +760,24 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -655,17 +747,24 @@ static int ssb_pci_sprom_get(struct ssb_
 		buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
 			      GFP_KERNEL);
 		if (!buf)
@ -620,7 +729,7 @@
 				err = 0;
 				goto out_free;
 			}
-@@ -677,19 +789,15 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -677,19 +776,15 @@ static int ssb_pci_sprom_get(struct ssb_
 out_free:
 	kfree(buf);
@ -725,7 +834,17 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
-@@ -405,10 +407,10 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -316,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
@@ -405,10 +410,10 @@ int ssb_bus_scan(struct ssb_bus *bus,
 				/* Ignore PCI cores on PCI-E cards.
 				 * Ignore PCI-E cores on PCI cards. */
 				if (dev->id.coreid == SSB_DEV_PCI) {
@ -738,7 +857,7 @@
 						continue;
 				}
 			}
-@@ -420,6 +422,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
+@@ -420,6 +425,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
 			break;
@ -764,36 +883,57 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,8 +31,10 @@ struct ssb_sprom {
+@@ -25,8 +31,13 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
-@@ -55,6 +63,10 @@ struct ssb_sprom {
+@@ -45,18 +56,22 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
 	u8 tri5gl;		/* 5.2GHz TX isolation */
 	u8 tri5g;		/* 5.3GHz TX isolation */
 	u8 tri5gh;		/* 5.8GHz TX isolation */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	u8 txpid2g[4];		/* 2GHz TX power index */
 +	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 +	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 +	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
- 	u8 rxpo2g;		/* 2GHz RX power offset */
+	s8 rxpo2g;		/* 2GHz RX power offset */
- 	u8 rxpo5g;		/* 5GHz RX power offset */
+	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
-@@ -76,6 +88,8 @@ struct ssb_sprom {
+ 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -76,26 +91,104 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -802,10 +942,17 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -88,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+-		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	struct {
 +		struct {
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
@ -815,10 +962,82 @@
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
-@@ -95,7 +118,7 @@ struct ssb_sprom {
+ /* Information about the PCB the circuitry is soldered on. */
 struct ssb_boardinfo {
 	u16 vendor;
 	u16 type;
@ -827,7 +1046,7 @@
 };
-@@ -225,10 +248,9 @@ struct ssb_driver {
+@@ -225,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -841,7 +1060,7 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
-@@ -304,7 +326,7 @@ struct ssb_bus {
+@@ -304,7 +396,7 @@ struct ssb_bus {
 	/* ID information about the Chip. */
 	u16 chip_id;
@ -850,7 +1069,7 @@
 	u16 sprom_offset;
 	u16 sprom_size;		/* number of words in sprom */
 	u8 chip_package;
-@@ -400,7 +422,9 @@ extern bool ssb_is_sprom_available(struc
+@@ -400,7 +492,9 @@ extern bool ssb_is_sprom_available(struc
 /* Set a fallback SPROM.
  * See kdoc at the function definition for complete documentation. */
@ -861,7 +1080,7 @@
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
-@@ -514,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -514,6 +608,7 @@ extern int ssb_bus_may_powerdown(struct
  * Otherwise static always-on powercontrol will be used. */
 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
@ -1187,7 +1406,53 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -417,12 +417,14 @@ static void ssb_pmu_resources_init(struc
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -91,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -320,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -329,7 +332,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -417,12 +424,14 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -1204,6 +1469,41 @@
 	case 0x4322:
 		/* We keep the default settings:
 		 * min_msk = 0xCBB
@@ -604,3 +613,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_gige.c
 +++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
@ -1272,6 +1572,15 @@
 static inline
 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
@@ -69,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -309,7 +314,7 @@ int ssb_pcicore_pcibios_map_irq(const st
 	return ssb_mips_irq(extpci_core->dev) + 2;
 }
@ -1718,6 +2027,15 @@
 /* core.c */
@@ -206,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb_driver_chipcommon.h
 +++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -8,7 +8,7 @@
@ -1800,6 +2118,16 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/embedded.c
 +++ b/drivers/ssb/embedded.c
@@ -3,7 +3,7 @@
@ -1822,6 +2150,25 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -6,7 +6,7 @@
@ -1833,3 +2180,32 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  *
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
--- a/target/linux/generic/patches-2.6.37/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.37/025-bcma_backport.patch
--- a/target/linux/generic/patches-2.6.38/020-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.38/020-ssb_update.patch
@ -17,7 +17,49 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_gige.h>
-@@ -557,7 +558,7 @@ error:
+@@ -139,19 +140,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -249,11 +237,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -292,7 +278,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -557,7 +542,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -26,7 +68,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -768,9 +769,9 @@ out:
+@@ -768,9 +753,9 @@ out:
 	return err;
 }
@ -39,7 +81,7 @@
 {
 	int err;
-@@ -851,8 +852,8 @@ err_disable_xtal:
+@@ -851,8 +836,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -50,7 +92,7 @@
 {
 	int err;
-@@ -875,9 +876,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -875,9 +860,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -63,7 +105,7 @@
 {
 	int err;
-@@ -897,8 +898,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
+@@ -897,8 +882,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
 #endif /* CONFIG_SSB_PCMCIAHOST */
 #ifdef CONFIG_SSB_SDIOHOST
@ -75,7 +117,7 @@
 {
 	int err;
-@@ -918,9 +920,9 @@ int ssb_bus_sdiobus_register(struct ssb_
+@@ -918,9 +904,9 @@ int ssb_bus_sdiobus_register(struct ssb_
 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -88,7 +130,7 @@
 {
 	int err;
-@@ -1001,8 +1003,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -1001,8 +987,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -99,7 +141,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1117,23 +1119,22 @@ static u32 ssb_tmslow_reject_bitmask(str
+@@ -1092,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1117,23 +1106,22 @@ static u32 ssb_tmslow_reject_bitmask(str
 {
 	u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
@ -130,7 +182,7 @@
 }
 int ssb_device_is_enabled(struct ssb_device *dev)
-@@ -1192,10 +1193,10 @@ void ssb_device_enable(struct ssb_device
+@@ -1192,10 +1180,10 @@ void ssb_device_enable(struct ssb_device
 }
 EXPORT_SYMBOL(ssb_device_enable);
@ -144,7 +196,7 @@
 {
 	int i;
 	u32 val;
-@@ -1203,7 +1204,7 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1203,7 +1191,7 @@ static int ssb_wait_bit(struct ssb_devic
 	for (i = 0; i < timeout; i++) {
 		val = ssb_read32(dev, reg);
 		if (set) {
@ -153,7 +205,7 @@
 				return 0;
 		} else {
 			if (!(val & bitmask))
-@@ -1220,20 +1221,38 @@ static int ssb_wait_bit(struct ssb_devic
+@@ -1220,20 +1208,38 @@ static int ssb_wait_bit(struct ssb_devic
 void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
 {
@ -201,7 +253,7 @@
 	ssb_write32(dev, SSB_TMSLOW,
 		    reject | SSB_TMSLOW_RESET |
-@@ -1242,13 +1261,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1242,13 +1248,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -237,7 +289,7 @@
 	default:
 		__ssb_dma_not_implemented(dev);
 	}
-@@ -1291,20 +1331,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1291,20 +1318,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
@ -262,7 +314,7 @@
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
-@@ -1312,6 +1352,37 @@ error:
+@@ -1312,6 +1339,37 @@ error:
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@ -311,7 +363,42 @@
  * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
  * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
  * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
-@@ -468,10 +468,14 @@ static void sprom_extract_r45(struct ssb
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
 {
 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,12 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 }
 /* Revs 4 5 and 8 have partially shared layout */
@@ -468,10 +459,14 @@ static void sprom_extract_r45(struct ssb
 		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
 		SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
 		SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
@ -326,7 +413,28 @@
 	}
 	SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
 	     SSB_SPROM4_ANTAVAIL_A_SHIFT);
-@@ -519,7 +523,13 @@ static void sprom_extract_r45(struct ssb
+@@ -500,16 +495,14 @@ static void sprom_extract_r45(struct ssb
 	}
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 	sprom_extract_r458(out, in);
@@ -519,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -341,10 +449,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -603,6 +613,61 @@ static void sprom_extract_r8(struct ssb_
+@@ -592,16 +591,69 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -399,11 +522,10 @@
 +		SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
 +	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
-+
+ 
 	sprom_extract_r458(out, in);
- 	/* TODO - get remaining rev 8 stuff needed */
+@@ -641,7 +693,7 @@ static int sprom_extract(struct ssb_bus
@@ -641,7 +706,7 @@ static int sprom_extract(struct ssb_bus
 		break;
 	default:
 		ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
@ -412,7 +534,7 @@
 			   " v1\n", out->revision);
 		out->revision = 1;
 		sprom_extract_r123(out, in);
-@@ -658,7 +723,6 @@ static int sprom_extract(struct ssb_bus
+@@ -658,7 +710,6 @@ static int sprom_extract(struct ssb_bus
 static int ssb_pci_sprom_get(struct ssb_bus *bus,
 			     struct ssb_sprom *sprom)
 {
@ -420,7 +542,7 @@
 	int err;
 	u16 *buf;
-@@ -666,7 +730,7 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -666,7 +717,7 @@ static int ssb_pci_sprom_get(struct ssb_
 		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
 		return -ENODEV;
 	}
@ -429,7 +551,7 @@
 		/*
 		 * get SPROM offset: SSB_SPROM_BASE1 except for
 		 * chipcommon rev >= 31 or chip ID is 0x4312 and
-@@ -703,10 +767,17 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -703,10 +754,17 @@ static int ssb_pci_sprom_get(struct ssb_
 		if (err) {
 			/* All CRC attempts failed.
 			 * Maybe there is no SPROM on the device?
@ -451,7 +573,7 @@
 				err = 0;
 				goto out_free;
 			}
-@@ -724,12 +795,9 @@ out_free:
+@@ -724,12 +782,9 @@ out_free:
 static void ssb_pci_get_boardinfo(struct ssb_bus *bus,
 				  struct ssb_boardinfo *bi)
 {
@ -738,7 +860,53 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -417,12 +417,14 @@ static void ssb_pmu_resources_init(struc
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -91,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -320,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -329,7 +332,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -417,12 +424,14 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -755,6 +923,41 @@
 	case 0x4322:
 		/* We keep the default settings:
 		 * min_msk = 0xCBB
@@ -604,3 +613,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_gige.c
 +++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
@ -823,6 +1026,15 @@
 static inline
 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
@@ -69,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -309,7 +314,7 @@ int ssb_pcicore_pcibios_map_irq(const st
 	return ssb_mips_irq(extpci_core->dev) + 2;
 }
@ -1229,6 +1441,16 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
@@ -316,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
 --- a/drivers/ssb/sprom.c
 +++ b/drivers/ssb/sprom.c
@@ -2,7 +2,7 @@
@ -1333,6 +1555,15 @@
 /* core.c */
@@ -206,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -16,6 +16,12 @@ struct pcmcia_device;
@ -1342,25 +1573,54 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,8 +31,10 @@ struct ssb_sprom {
+@@ -25,8 +31,13 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
-@@ -80,6 +88,8 @@ struct ssb_sprom {
+@@ -45,10 +56,10 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
@@ -59,8 +70,8 @@ struct ssb_sprom {
 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	s8 rxpo2g;		/* 2GHz RX power offset */
 +	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -80,26 +91,104 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -1369,10 +1629,17 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -92,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+-		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	struct {
 +		struct {
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
@ -1382,10 +1649,82 @@
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
-@@ -99,7 +118,7 @@ struct ssb_sprom {
+ /* Information about the PCB the circuitry is soldered on. */
 struct ssb_boardinfo {
 	u16 vendor;
 	u16 type;
@ -1394,7 +1733,7 @@
 };
-@@ -229,10 +248,9 @@ struct ssb_driver {
+@@ -229,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -1408,7 +1747,7 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
-@@ -308,7 +326,7 @@ struct ssb_bus {
+@@ -308,7 +396,7 @@ struct ssb_bus {
 	/* ID information about the Chip. */
 	u16 chip_id;
@ -1417,7 +1756,7 @@
 	u16 sprom_offset;
 	u16 sprom_size;		/* number of words in sprom */
 	u8 chip_package;
-@@ -404,7 +422,9 @@ extern bool ssb_is_sprom_available(struc
+@@ -404,7 +492,9 @@ extern bool ssb_is_sprom_available(struc
 /* Set a fallback SPROM.
  * See kdoc at the function definition for complete documentation. */
@ -1428,7 +1767,7 @@
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
-@@ -518,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -518,6 +608,7 @@ extern int ssb_bus_may_powerdown(struct
  * Otherwise static always-on powercontrol will be used. */
 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
@ -1518,6 +1857,16 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/embedded.c
 +++ b/drivers/ssb/embedded.c
@@ -3,7 +3,7 @@
@ -1540,6 +1889,25 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -6,7 +6,7 @@
@ -1551,3 +1919,32 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  *
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
--- a/target/linux/generic/patches-2.6.38/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.38/025-bcma_backport.patch
--- a/target/linux/generic/patches-2.6.39/020-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.39/020-ssb_update.patch
@ -118,7 +118,53 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -417,12 +417,14 @@ static void ssb_pmu_resources_init(struc
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -91,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -320,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -329,7 +332,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -417,12 +424,14 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -135,6 +181,41 @@
 	case 0x4322:
 		/* We keep the default settings:
 		 * min_msk = 0xCBB
@@ -604,3 +613,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_gige.c
 +++ b/drivers/ssb/driver_gige.c
@@ -3,7 +3,7 @@
@ -203,6 +284,15 @@
 static inline
 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
@@ -69,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -309,7 +314,7 @@ int ssb_pcicore_pcibios_map_irq(const st
 	return ssb_mips_irq(extpci_core->dev) + 2;
 }
@ -564,7 +654,49 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_gige.h>
-@@ -557,7 +558,7 @@ error:
+@@ -139,19 +140,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -249,11 +237,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -292,7 +278,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -557,7 +542,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -573,7 +705,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -768,9 +769,9 @@ out:
+@@ -768,9 +753,9 @@ out:
 	return err;
 }
@ -586,7 +718,7 @@
 {
 	int err;
-@@ -851,8 +852,8 @@ err_disable_xtal:
+@@ -851,8 +836,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -597,7 +729,7 @@
 {
 	int err;
-@@ -875,9 +876,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -875,9 +860,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -610,7 +742,7 @@
 {
 	int err;
-@@ -897,8 +898,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
+@@ -897,8 +882,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
 #endif /* CONFIG_SSB_PCMCIAHOST */
 #ifdef CONFIG_SSB_SDIOHOST
@ -622,7 +754,7 @@
 {
 	int err;
-@@ -918,9 +920,9 @@ int ssb_bus_sdiobus_register(struct ssb_
+@@ -918,9 +904,9 @@ int ssb_bus_sdiobus_register(struct ssb_
 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -635,7 +767,7 @@
 {
 	int err;
-@@ -1001,8 +1003,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -1001,8 +987,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -646,7 +778,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1117,23 +1119,22 @@ static u32 ssb_tmslow_reject_bitmask(str
+@@ -1092,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1117,23 +1106,22 @@ static u32 ssb_tmslow_reject_bitmask(str
 {
 	u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
@ -677,7 +819,7 @@
 }
 int ssb_device_is_enabled(struct ssb_device *dev)
-@@ -1260,13 +1261,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1260,13 +1248,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -713,7 +855,7 @@
 	default:
 		__ssb_dma_not_implemented(dev);
 	}
-@@ -1309,20 +1331,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
+@@ -1309,20 +1318,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
@ -738,7 +880,7 @@
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
-@@ -1330,6 +1352,37 @@ error:
+@@ -1330,6 +1339,37 @@ error:
 }
 EXPORT_SYMBOL(ssb_bus_powerup);
@ -787,7 +929,63 @@
  * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
  * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
  * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
-@@ -523,7 +523,13 @@ static void sprom_extract_r45(struct ssb
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
 {
 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,12 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 }
 /* Revs 4 5 and 8 have partially shared layout */
@@ -504,16 +495,14 @@ static void sprom_extract_r45(struct ssb
 	}
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 	sprom_extract_r458(out, in);
@@ -523,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -802,10 +1000,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -607,6 +613,61 @@ static void sprom_extract_r8(struct ssb_
+@@ -596,16 +591,69 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -860,11 +1073,10 @@
 +		SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
 +	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
-+
+ 
 	sprom_extract_r458(out, in);
- 	/* TODO - get remaining rev 8 stuff needed */
+@@ -662,7 +710,6 @@ static int sprom_extract(struct ssb_bus
@@ -662,7 +723,6 @@ static int sprom_extract(struct ssb_bus
 static int ssb_pci_sprom_get(struct ssb_bus *bus,
 			     struct ssb_sprom *sprom)
 {
@ -872,7 +1084,7 @@
 	int err;
 	u16 *buf;
-@@ -707,10 +767,17 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -707,10 +754,17 @@ static int ssb_pci_sprom_get(struct ssb_
 		if (err) {
 			/* All CRC attempts failed.
 			 * Maybe there is no SPROM on the device?
@ -894,7 +1106,7 @@
 				err = 0;
 				goto out_free;
 			}
-@@ -728,12 +795,9 @@ out_free:
+@@ -728,12 +782,9 @@ out_free:
 static void ssb_pci_get_boardinfo(struct ssb_bus *bus,
 				  struct ssb_boardinfo *bi)
 {
@ -974,6 +1186,16 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
@@ -316,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
 --- a/drivers/ssb/sprom.c
 +++ b/drivers/ssb/sprom.c
@@ -2,7 +2,7 @@
@ -1069,6 +1291,15 @@
 /* core.c */
@@ -206,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -16,6 +16,12 @@ struct pcmcia_device;
@ -1078,25 +1309,54 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,8 +31,10 @@ struct ssb_sprom {
+@@ -25,8 +31,13 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
-@@ -80,6 +88,8 @@ struct ssb_sprom {
+@@ -45,10 +56,10 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
@@ -59,8 +70,8 @@ struct ssb_sprom {
 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	s8 rxpo2g;		/* 2GHz RX power offset */
 +	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -80,26 +91,104 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -1105,10 +1365,17 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -92,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+-		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	struct {
 +		struct {
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
@ -1118,10 +1385,82 @@
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
-@@ -99,7 +118,7 @@ struct ssb_sprom {
+ /* Information about the PCB the circuitry is soldered on. */
 struct ssb_boardinfo {
 	u16 vendor;
 	u16 type;
@ -1130,7 +1469,7 @@
 };
-@@ -229,10 +248,9 @@ struct ssb_driver {
+@@ -229,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -1144,7 +1483,7 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
-@@ -308,7 +326,7 @@ struct ssb_bus {
+@@ -308,7 +396,7 @@ struct ssb_bus {
 	/* ID information about the Chip. */
 	u16 chip_id;
@ -1153,7 +1492,7 @@
 	u16 sprom_offset;
 	u16 sprom_size;		/* number of words in sprom */
 	u8 chip_package;
-@@ -404,7 +422,9 @@ extern bool ssb_is_sprom_available(struc
+@@ -404,7 +492,9 @@ extern bool ssb_is_sprom_available(struc
 /* Set a fallback SPROM.
  * See kdoc at the function definition for complete documentation. */
@ -1164,7 +1503,7 @@
 /* Suspend a SSB bus.
  * Call this from the parent bus suspend routine. */
-@@ -518,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -518,6 +608,7 @@ extern int ssb_bus_may_powerdown(struct
  * Otherwise static always-on powercontrol will be used. */
 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
@ -1376,6 +1715,16 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/embedded.c
 +++ b/drivers/ssb/embedded.c
@@ -3,7 +3,7 @@
@ -1398,6 +1747,25 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -6,7 +6,7 @@
@ -1409,3 +1777,32 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  *
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
--- a/target/linux/generic/patches-2.6.39/025-bcma_backport.patch
+++ b/target/linux/generic/patches-2.6.39/025-bcma_backport.patch
--- a/target/linux/generic/patches-3.0/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.0/020-ssb_update.patch
@ -37,7 +37,53 @@
  * Copyright 2007, Broadcom Corporation
  *
  * Licensed under the GNU/GPL. See COPYING for details.
-@@ -417,9 +417,9 @@ static void ssb_pmu_resources_init(struc
+@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -91,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -320,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -329,7 +332,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -417,9 +424,9 @@ static void ssb_pmu_resources_init(struc
 	u32 min_msk = 0, max_msk = 0;
 	unsigned int i;
 	const struct pmu_res_updown_tab_entry *updown_tab = NULL;
@ -49,6 +95,41 @@
 	switch (bus->chip_id) {
 	case 0x4312:
@@ -606,3 +613,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_extif.c
 +++ b/drivers/ssb/driver_extif.c
@@ -3,7 +3,7 @@
@ -116,6 +197,16 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/driver_pcicore.c
 +++ b/drivers/ssb/driver_pcicore.c
@@ -3,7 +3,7 @@
@ -127,6 +218,15 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -74,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
@@ -314,7 +314,7 @@ int ssb_pcicore_pcibios_map_irq(const st
 	return ssb_mips_irq(extpci_core->dev) + 2;
 }
@ -193,7 +293,49 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_gige.h>
-@@ -557,7 +558,7 @@ error:
+@@ -139,19 +140,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -249,11 +237,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -292,7 +278,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -557,7 +542,7 @@ error:
 }
 /* Needs ssb_buses_lock() */
@ -202,7 +344,7 @@
 {
 	struct ssb_bus *bus, *n;
 	int err = 0;
-@@ -768,9 +769,9 @@ out:
+@@ -768,9 +753,9 @@ out:
 	return err;
 }
@ -215,7 +357,7 @@
 {
 	int err;
-@@ -851,8 +852,8 @@ err_disable_xtal:
+@@ -851,8 +836,8 @@ err_disable_xtal:
 }
 #ifdef CONFIG_SSB_PCIHOST
@ -226,7 +368,7 @@
 {
 	int err;
-@@ -875,9 +876,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
+@@ -875,9 +860,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
 #endif /* CONFIG_SSB_PCIHOST */
 #ifdef CONFIG_SSB_PCMCIAHOST
@ -239,7 +381,7 @@
 {
 	int err;
-@@ -897,8 +898,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
+@@ -897,8 +882,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register
 #endif /* CONFIG_SSB_PCMCIAHOST */
 #ifdef CONFIG_SSB_SDIOHOST
@ -251,7 +393,7 @@
 {
 	int err;
-@@ -918,9 +920,9 @@ int ssb_bus_sdiobus_register(struct ssb_
+@@ -918,9 +904,9 @@ int ssb_bus_sdiobus_register(struct ssb_
 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
@ -264,7 +406,7 @@
 {
 	int err;
-@@ -1001,8 +1003,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
+@@ -1001,8 +987,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
 	switch (plltype) {
 	case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
 		if (m & SSB_CHIPCO_CLK_T6_MMASK)
@ -275,7 +417,17 @@
 	case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
 	case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
 	case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
-@@ -1259,13 +1261,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -1092,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1259,13 +1248,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -322,7 +474,63 @@
  * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
  * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
  * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
-@@ -523,7 +523,13 @@ static void sprom_extract_r45(struct ssb
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
 {
 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,12 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 }
 /* Revs 4 5 and 8 have partially shared layout */
@@ -504,16 +495,14 @@ static void sprom_extract_r45(struct ssb
 	}
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 	sprom_extract_r458(out, in);
@@ -523,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -337,10 +545,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -607,6 +613,61 @@ static void sprom_extract_r8(struct ssb_
+@@ -596,16 +591,69 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -395,11 +618,10 @@
 +		SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
 +	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
-+
+ 
 	sprom_extract_r458(out, in);
- 	/* TODO - get remaining rev 8 stuff needed */
+@@ -734,12 +782,9 @@ out_free:
@@ -734,12 +795,9 @@ out_free:
 static void ssb_pci_get_boardinfo(struct ssb_bus *bus,
 				  struct ssb_boardinfo *bi)
 {
@ -457,6 +679,25 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/scan.c
 +++ b/drivers/ssb/scan.c
@@ -2,7 +2,7 @@
@ -478,6 +719,16 @@
 			bus->chip_package = 0;
 		} else {
 			bus->chip_id = 0x4710;
@@ -319,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -6,7 +6,7 @@
@ -489,6 +740,25 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  *
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/drivers/ssb/sprom.c
 +++ b/drivers/ssb/sprom.c
@@ -2,7 +2,7 @@
@ -509,25 +779,54 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,8 +31,10 @@ struct ssb_sprom {
+@@ -25,8 +31,13 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
-+	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+	char alpha2[2];		/* Country Code as two chars like EU or US */
-+	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+	u8 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 +	u8 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
-@@ -80,6 +88,8 @@ struct ssb_sprom {
+@@ -45,10 +56,10 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
@@ -59,8 +70,8 @@ struct ssb_sprom {
 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	s8 rxpo2g;		/* 2GHz RX power offset */
 +	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -80,26 +91,104 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -536,10 +835,17 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -92,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+-		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	struct {
 +		struct {
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
@ -549,10 +855,82 @@
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
-@@ -99,7 +118,7 @@ struct ssb_sprom {
+ /* Information about the PCB the circuitry is soldered on. */
 struct ssb_boardinfo {
 	u16 vendor;
 	u16 type;
@ -561,7 +939,7 @@
 };
-@@ -229,10 +248,9 @@ struct ssb_driver {
+@@ -229,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -699,3 +1077,24 @@
 /* Values for SSB_SPROM1_BINF_CCODE */
 enum {
 	SSB_SPROM1CCODE_WORLD = 0,
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
@@ -207,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
--- a/target/linux/generic/patches-3.0/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.0/025-bcma_backport.patch
--- a/target/linux/generic/patches-3.1/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.1/020-ssb_update.patch
@ -1,3 +1,14 @@
 --- a/drivers/ssb/driver_pcicore.c
 +++ b/drivers/ssb/driver_pcicore.c
@@ -74,7 +74,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
 --- a/drivers/ssb/b43_pci_bridge.c
 +++ b/drivers/ssb/b43_pci_bridge.c
@@ -11,6 +11,7 @@
@ -8,6 +19,101 @@
 #include <linux/ssb/ssb.h>
 #include "ssb_private.h"
 --- a/drivers/ssb/driver_chipcommon_pmu.c
 +++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -12,6 +12,9 @@
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -91,10 +94,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -320,7 +319,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -329,7 +332,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -606,3 +613,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_mipscore.c
 +++ b/drivers/ssb/driver_mipscore.c
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
@@ -12,6 +12,7 @@
@ -18,7 +124,59 @@
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_regs.h>
 #include <linux/ssb/ssb_driver_gige.h>
-@@ -1260,16 +1261,34 @@ void ssb_device_disable(struct ssb_devic
+@@ -139,19 +140,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -249,11 +237,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -292,7 +278,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -1093,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
@@ -1260,16 +1248,34 @@ void ssb_device_disable(struct ssb_devic
 }
 EXPORT_SYMBOL(ssb_device_disable);
@ -58,7 +216,63 @@
 	}
 --- a/drivers/ssb/pci.c
 +++ b/drivers/ssb/pci.c
-@@ -523,7 +523,13 @@ static void sprom_extract_r45(struct ssb
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
 {
 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,12 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 }
 /* Revs 4 5 and 8 have partially shared layout */
@@ -504,16 +495,14 @@ static void sprom_extract_r45(struct ssb
 	}
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 	sprom_extract_r458(out, in);
@@ -523,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -73,10 +287,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -607,6 +613,61 @@ static void sprom_extract_r8(struct ssb_
+@@ -596,16 +591,69 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -131,10 +360,74 @@
 +		SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
 +	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
-+
+ 
 	sprom_extract_r458(out, in);
- 	/* TODO - get remaining rev 8 stuff needed */
+--- a/drivers/ssb/pcmcia.c
 +++ b/drivers/ssb/pcmcia.c
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/scan.c
 +++ b/drivers/ssb/scan.c
@@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
@@ -207,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -16,6 +16,12 @@ struct pcmcia_device;
@ -144,22 +437,56 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -25,7 +31,7 @@ struct ssb_sprom {
+@@ -25,10 +31,13 @@ struct ssb_sprom {
 	u8 et1phyaddr;		/* MII address for enet1 */
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 -	u8 board_rev;		/* Board revision number from 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 */
- 	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
+-	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
- 	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
+-	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
-@@ -82,6 +88,8 @@ struct ssb_sprom {
+	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 */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
@@ -47,10 +56,10 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
@@ -61,8 +70,8 @@ struct ssb_sprom {
 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	s8 rxpo2g;		/* 2GHz RX power offset */
 +	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -82,19 +91,97 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -168,10 +495,17 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -94,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+-		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	struct {
 +		struct {
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
@ -181,10 +515,83 @@
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
-@@ -231,10 +248,9 @@ struct ssb_driver {
+ /* Information about the PCB the circuitry is soldered on. */
@@ -231,10 +318,9 @@ struct ssb_driver {
 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
@ -198,6 +605,16 @@
 extern void ssb_driver_unregister(struct ssb_driver *drv);
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 --- a/include/linux/ssb/ssb_regs.h
 +++ b/include/linux/ssb/ssb_regs.h
@@ -432,6 +432,56 @@
--- a/target/linux/generic/patches-3.1/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.1/025-bcma_backport.patch
--- a/target/linux/generic/patches-3.2/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.2/020-ssb_update.patch
@ -1,6 +1,222 @@
 --- a/drivers/ssb/driver_chipcommon_pmu.c
 +++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -13,6 +13,9 @@
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 #include <linux/export.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_mipscore.c
 +++ b/drivers/ssb/driver_mipscore.c
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/driver_pcicore.c
 +++ b/drivers/ssb/driver_pcicore.c
@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_
 	u32 tmp;
 	/* We do only have one cardbus device behind the bridge. */
 -	if (pc->cardbusmode && (dev >= 1))
 +	if (pc->cardbusmode && (dev > 1))
 		goto out;
 	if (bus == 0) {
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
@@ -140,19 +140,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -250,11 +237,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -293,7 +278,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -1094,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
 --- a/drivers/ssb/pci.c
 +++ b/drivers/ssb/pci.c
-@@ -523,7 +523,13 @@ static void sprom_extract_r45(struct ssb
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
 {
 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,12 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 }
 /* Revs 4 5 and 8 have partially shared layout */
@@ -504,16 +495,14 @@ static void sprom_extract_r45(struct ssb
 	}
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 	sprom_extract_r458(out, in);
@@ -523,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -15,10 +231,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -607,6 +613,61 @@ static void sprom_extract_r8(struct ssb_
+@@ -596,16 +591,69 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -73,10 +304,74 @@
 +		SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
 +	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
 +		SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
-+
+ 
 	sprom_extract_r458(out, in);
- 	/* TODO - get remaining rev 8 stuff needed */
+--- a/drivers/ssb/pcmcia.c
 +++ b/drivers/ssb/pcmcia.c
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/scan.c
 +++ b/drivers/ssb/scan.c
@@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
@@ -207,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -16,6 +16,12 @@ struct pcmcia_device;
@ -86,13 +381,54 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -82,6 +88,8 @@ struct ssb_sprom {
+@@ -26,9 +32,12 @@ struct ssb_sprom {
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 	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 */
 -	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 -	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 +	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 */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
@@ -47,10 +56,10 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
@@ -61,8 +70,8 @@ struct ssb_sprom {
 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	s8 rxpo2g;		/* 2GHz RX power offset */
 +	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -82,19 +91,97 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -101,22 +437,111 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
-@@ -94,6 +102,15 @@ struct ssb_sprom {
+ 	struct {
- 		} ghz5;		/* 5GHz band */
+		s8 a0, a1, a2, a3;
- 	} antenna_gain;
+	} antenna_gain;
- 
+
 +	struct {
-+		struct {
+ 		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
 +		} ghz2;
-+		struct {
+ 		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 -	} antenna_gain;
 +			u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
 +		} ghz5;
 +	} fem;
 +
- 	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
+	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
 /* Information about the PCB the circuitry is soldered on. */
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 --- a/include/linux/ssb/ssb_regs.h
 +++ b/include/linux/ssb/ssb_regs.h
@@ -432,6 +432,56 @@
@ -184,50 +609,3 @@
 #define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
 #define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
 #define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
@@ -464,6 +515,46 @@
 /* Values for boardflags_lo read from SPROM */
 #define SSB_BFL_BTCOEXIST		0x0001	/* implements Bluetooth coexistance */
 +#define SSB_BFL_PACTRL			0x0002	/* GPIO 9 controlling the PA */
 +#define SSB_BFL_AIRLINEMODE		0x0004	/* implements GPIO 13 radio disable indication */
 +#define SSB_BFL_RSSI			0x0008	/* software calculates nrssi slope. */
 +#define SSB_BFL_ENETSPI			0x0010	/* has ephy roboswitch spi */
 +#define SSB_BFL_XTAL_NOSLOW		0x0020	/* no slow clock available */
 +#define SSB_BFL_CCKHIPWR		0x0040	/* can do high power CCK transmission */
 +#define SSB_BFL_ENETADM			0x0080	/* has ADMtek switch */
 +#define SSB_BFL_ENETVLAN		0x0100	/* can do vlan */
 +#define SSB_BFL_AFTERBURNER		0x0200	/* supports Afterburner mode */
 +#define SSB_BFL_NOPCI			0x0400	/* board leaves PCI floating */
 +#define SSB_BFL_FEM			0x0800	/* supports the Front End Module */
 +#define SSB_BFL_EXTLNA			0x1000	/* has an external LNA */
 +#define SSB_BFL_HGPA			0x2000	/* had high gain PA */
 +#define SSB_BFL_BTCMOD			0x4000	/* BFL_BTCOEXIST is given in alternate GPIOs */
 +#define SSB_BFL_ALTIQ			0x8000	/* alternate I/Q settings */
 +
 +/* Values for boardflags_hi read from SPROM */
 +#define SSB_BFH_NOPA			0x0001	/* has no PA */
 +#define SSB_BFH_RSSIINV			0x0002	/* RSSI uses positive slope (not TSSI) */
 +#define SSB_BFH_PAREF			0x0004	/* uses the PARef LDO */
 +#define SSB_BFH_3TSWITCH		0x0008	/* uses a triple throw switch shared with bluetooth */
 +#define SSB_BFH_PHASESHIFT		0x0010	/* can support phase shifter */
 +#define SSB_BFH_BUCKBOOST		0x0020	/* has buck/booster */
 +#define SSB_BFH_FEM_BT			0x0040	/* has FEM and switch to share antenna with bluetooth */
 +
 +/* Values for boardflags2_lo read from SPROM */
 +#define SSB_BFL2_RXBB_INT_REG_DIS	0x0001	/* external RX BB regulator present */
 +#define SSB_BFL2_APLL_WAR		0x0002	/* alternative A-band PLL settings implemented */
 +#define SSB_BFL2_TXPWRCTRL_EN 		0x0004	/* permits enabling TX Power Control */
 +#define SSB_BFL2_2X4_DIV		0x0008	/* 2x4 diversity switch */
 +#define SSB_BFL2_5G_PWRGAIN		0x0010	/* supports 5G band power gain */
 +#define SSB_BFL2_PCIEWAR_OVR		0x0020	/* overrides ASPM and Clkreq settings */
 +#define SSB_BFL2_CAESERS_BRD		0x0040	/* is Caesers board (unused) */
 +#define SSB_BFL2_BTC3WIRE		0x0080	/* used 3-wire bluetooth coexist */
 +#define SSB_BFL2_SKWRKFEM_BRD		0x0100	/* 4321mcm93 uses Skyworks FEM */
 +#define SSB_BFL2_SPUR_WAR		0x0200	/* has a workaround for clock-harmonic spurs */
 +#define SSB_BFL2_GPLL_WAR		0x0400	/* altenative G-band PLL settings implemented */
 +
 +/* Values for boardflags_lo read from SPROM */
 +#define SSB_BFL_BTCOEXIST		0x0001	/* implements Bluetooth coexistance */
 #define SSB_BFL_PACTRL			0x0002	/* GPIO 9 controlling the PA */
 #define SSB_BFL_AIRLINEMODE		0x0004	/* implements GPIO 13 radio disable indication */
 #define SSB_BFL_RSSI			0x0008	/* software calculates nrssi slope. */
--- a/target/linux/generic/patches-3.2/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.2/025-bcma_backport.patch
--- a/target/linux/generic/patches-3.3/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.3/020-ssb_update.patch
@ -1,6 +1,211 @@
 --- a/drivers/ssb/driver_chipcommon_pmu.c
 +++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -13,6 +13,9 @@
 #include <linux/ssb/ssb_driver_chipcommon.h>
 #include <linux/delay.h>
 #include <linux/export.h>
 +#ifdef CONFIG_BCM47XX
 +#include <asm/mach-bcm47xx/nvram.h>
 +#endif
 #include "ssb_private.h"
@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
 	u32 pmuctl, tmp, pllctl;
 	unsigned int i;
 -	if ((bus->chip_id == 0x5354) && !crystalfreq) {
 -		/* The 5354 crystal freq is 25MHz */
 -		crystalfreq = 25000;
 -	}
 	if (crystalfreq)
 		e = pmu0_plltab_find_entry(crystalfreq);
 	if (!e)
@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
 	u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
 	if (bus->bustype == SSB_BUSTYPE_SSB) {
 -		/* TODO: The user may override the crystal frequency. */
 +#ifdef CONFIG_BCM47XX
 +		char buf[20];
 +		if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
 +			crystalfreq = simple_strtoul(buf, NULL, 0);
 +#endif
 	}
 	switch (bus->chip_id) {
@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
 		ssb_pmu1_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4328:
 +		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 +		break;
 	case 0x5354:
 +		if (crystalfreq == 0)
 +			crystalfreq = 25000;
 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
 		break;
 	case 0x4322:
@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
 EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
 +
 +u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		/* 5354 chip uses a non programmable PLL of frequency 240MHz */
 +		return 240000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU cpu clock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 +
 +u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
 +{
 +	struct ssb_bus *bus = cc->dev->bus;
 +
 +	switch (bus->chip_id) {
 +	case 0x5354:
 +		return 120000000;
 +	default:
 +		ssb_printk(KERN_ERR PFX
 +			   "ERROR: PMU controlclock unknown for device %04X\n",
 +			   bus->chip_id);
 +		return 0;
 +	}
 +}
 --- a/drivers/ssb/driver_mipscore.c
 +++ b/drivers/ssb/driver_mipscore.c
@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
 	struct ssb_bus *bus = mcore->dev->bus;
 	u32 pll_type, n, m, rate = 0;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_cpu_clock(&bus->chipco);
 +
 	if (bus->extif.dev) {
 		ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
 	} else if (bus->chipco.dev) {
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
@@ -140,19 +140,6 @@ static void ssb_device_put(struct ssb_de
 		put_device(dev->dev);
 }
 -static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		get_driver(&drv->drv);
 -	return drv;
 -}
 -
 -static inline void ssb_driver_put(struct ssb_driver *drv)
 -{
 -	if (drv)
 -		put_driver(&drv->drv);
 -}
 -
 static int ssb_device_resume(struct device *dev)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
@@ -250,11 +237,9 @@ int ssb_devices_freeze(struct ssb_bus *b
 			ssb_device_put(sdev);
 			continue;
 		}
 -		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
 -		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
 -			ssb_device_put(sdev);
 +		sdrv = drv_to_ssb_drv(sdev->dev->driver);
 +		if (SSB_WARN_ON(!sdrv->remove))
 			continue;
 -		}
 		sdrv->remove(sdev);
 		ctx->device_frozen[i] = 1;
 	}
@@ -293,7 +278,6 @@ int ssb_devices_thaw(struct ssb_freeze_c
 				   dev_name(sdev->dev));
 			result = err;
 		}
 -		ssb_driver_put(sdrv);
 		ssb_device_put(sdev);
 	}
@@ -1094,6 +1078,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
 	u32 plltype;
 	u32 clkctl_n, clkctl_m;
 +	if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
 +		return ssb_pmu_get_controlclock(&bus->chipco);
 +
 	if (ssb_extif_available(&bus->extif))
 		ssb_extif_get_clockcontrol(&bus->extif, &plltype,
 					   &clkctl_n, &clkctl_m);
 --- a/drivers/ssb/pci.c
 +++ b/drivers/ssb/pci.c
-@@ -523,7 +523,13 @@ static void sprom_extract_r45(struct ssb
+@@ -331,7 +331,6 @@ static void sprom_extract_r123(struct ss
 {
 	int i;
 	u16 v;
 -	s8 gain;
 	u16 loc[3];
 	if (out->revision == 3)			/* rev 3 moved MAC */
@@ -390,20 +389,12 @@ static void sprom_extract_r123(struct ss
 		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 	/* Extract the antenna gain values. */
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_BG,
 -				    SSB_SPROM1_AGAIN_BG_SHIFT);
 -	out->antenna_gain.ghz24.a0 = gain;
 -	out->antenna_gain.ghz24.a1 = gain;
 -	out->antenna_gain.ghz24.a2 = gain;
 -	out->antenna_gain.ghz24.a3 = gain;
 -	gain = r123_extract_antgain(out->revision, in,
 -				    SSB_SPROM1_AGAIN_A,
 -				    SSB_SPROM1_AGAIN_A_SHIFT);
 -	out->antenna_gain.ghz5.a0 = gain;
 -	out->antenna_gain.ghz5.a1 = gain;
 -	out->antenna_gain.ghz5.a2 = gain;
 -	out->antenna_gain.ghz5.a3 = gain;
 +	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_BG,
 +						    SSB_SPROM1_AGAIN_BG_SHIFT);
 +	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 +						    SSB_SPROM1_AGAIN_A,
 +						    SSB_SPROM1_AGAIN_A_SHIFT);
 }
 /* Revs 4 5 and 8 have partially shared layout */
@@ -504,16 +495,14 @@ static void sprom_extract_r45(struct ssb
 	}
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN0, SSB_SPROM4_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM4_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM4_AGAIN01,
 	     SSB_SPROM4_AGAIN1, SSB_SPROM4_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN2, SSB_SPROM4_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM4_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM4_AGAIN23,
 	     SSB_SPROM4_AGAIN3, SSB_SPROM4_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 	sprom_extract_r458(out, in);
@@ -523,7 +512,13 @@ static void sprom_extract_r45(struct ssb
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
 	int i;
@ -15,10 +220,25 @@
 	/* extract the MAC address */
 	for (i = 0; i < 3; i++) {
-@@ -607,6 +613,38 @@ static void sprom_extract_r8(struct ssb_
+@@ -596,16 +591,46 @@ static void sprom_extract_r8(struct ssb_
- 	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
+ 	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
 	       sizeof(out->antenna_gain.ghz5));
 	/* Extract the antenna gain values. */
 -	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
 -	SPEX(antenna_gain.ghz24.a1, SSB_SPROM8_AGAIN01,
 +	SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
 	     SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
 -	SPEX(antenna_gain.ghz24.a2, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
 -	SPEX(antenna_gain.ghz24.a3, SSB_SPROM8_AGAIN23,
 +	SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
 	     SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
 -	memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
 -	       sizeof(out->antenna_gain.ghz5));
 +
 +	/* Extract cores power info info */
 +	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
 +		o = pwr_info_offset[i];
@ -50,10 +270,74 @@
 +		SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
 +		SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
 +	}
-+
+ 
 	/* Extract FEM info */
 	SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,
- 		SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
+--- a/drivers/ssb/pcmcia.c
 +++ b/drivers/ssb/pcmcia.c
@@ -676,14 +676,10 @@ static int ssb_pcmcia_do_get_invariants(
 	case SSB_PCMCIA_CIS_ANTGAIN:
 		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
 			"antg tpl size");
 -		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
 -		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
 +		sprom->antenna_gain.a0 = tuple->TupleData[1];
 +		sprom->antenna_gain.a1 = tuple->TupleData[1];
 +		sprom->antenna_gain.a2 = tuple->TupleData[1];
 +		sprom->antenna_gain.a3 = tuple->TupleData[1];
 		break;
 	case SSB_PCMCIA_CIS_BFLAGS:
 		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
 --- a/drivers/ssb/scan.c
 +++ b/drivers/ssb/scan.c
@@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
 			bus->chip_package = 0;
 		}
 	}
 +	ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 +		   "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 +		   bus->chip_package);
 	if (!bus->nr_devices)
 		bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 	if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
 --- a/drivers/ssb/sdio.c
 +++ b/drivers/ssb/sdio.c
@@ -551,14 +551,10 @@ int ssb_sdio_get_invariants(struct ssb_b
 			case SSB_SDIO_CIS_ANTGAIN:
 				GOTO_ERROR_ON(tuple->size != 2,
 					      "antg tpl size");
 -				sprom->antenna_gain.ghz24.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz24.a3 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a0 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a1 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a2 = tuple->data[1];
 -				sprom->antenna_gain.ghz5.a3 = tuple->data[1];
 +				sprom->antenna_gain.a0 = tuple->data[1];
 +				sprom->antenna_gain.a1 = tuple->data[1];
 +				sprom->antenna_gain.a2 = tuple->data[1];
 +				sprom->antenna_gain.a3 = tuple->data[1];
 				break;
 			case SSB_SDIO_CIS_BFLAGS:
 				GOTO_ERROR_ON((tuple->size != 3) &&
 --- a/drivers/ssb/ssb_private.h
 +++ b/drivers/ssb/ssb_private.h
@@ -207,4 +207,8 @@ static inline void b43_pci_ssb_bridge_ex
 }
 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */
 +/* driver_chipcommon_pmu.c */
 +extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
 +extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
 +
 #endif /* LINUX_SSB_PRIVATE_H_ */
 --- a/include/linux/ssb/ssb.h
 +++ b/include/linux/ssb/ssb.h
@@ -16,6 +16,12 @@ struct pcmcia_device;
@ -63,13 +347,54 @@
 +struct ssb_sprom_core_pwr_info {
 +	u8 itssi_2g, itssi_5g;
 +	u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
-+	u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+	u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
 +};
 +
 struct ssb_sprom {
 	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
-@@ -82,6 +88,8 @@ struct ssb_sprom {
+@@ -26,9 +32,12 @@ struct ssb_sprom {
 	u8 et0mdcport;		/* MDIO for enet0 */
 	u8 et1mdcport;		/* MDIO for enet1 */
 	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 */
 -	u16 leddc_on_time;	/* LED Powersave Duty Cycle On Count */
 -	u16 leddc_off_time;	/* LED Powersave Duty Cycle Off Count */
 +	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 */
 	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
 	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
 	u16 pa0b0;
@@ -47,10 +56,10 @@ struct ssb_sprom {
 	u8 gpio1;		/* GPIO pin 1 */
 	u8 gpio2;		/* GPIO pin 2 */
 	u8 gpio3;		/* GPIO pin 3 */
 -	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 -	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
 +	u8 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
 	u8 tri2g;		/* 2.4GHz TX isolation */
@@ -61,8 +70,8 @@ struct ssb_sprom {
 	u8 txpid5gl[4];		/* 4.9 - 5.1GHz TX power index */
 	u8 txpid5g[4];		/* 5.1 - 5.5GHz TX power index */
 	u8 txpid5gh[4];		/* 5.5 - ...GHz TX power index */
 -	u8 rxpo2g;		/* 2GHz RX power offset */
 -	u8 rxpo5g;		/* 5GHz RX power offset */
 +	s8 rxpo2g;		/* 2GHz RX power offset */
 +	s8 rxpo5g;		/* 5GHz RX power offset */
 	u8 rssisav2g;		/* 2GHz RSSI params */
 	u8 rssismc2g;
 	u8 rssismf2g;
@@ -82,16 +91,13 @@ struct ssb_sprom {
 	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
 	/* TODO store board flags in a single u64 */
@ -78,6 +403,108 @@
 	/* Antenna gain values for up to 4 antennas
 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
 	 * loss in the connectors is bigger than the gain. */
 	struct {
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz24;	/* 2.4GHz band */
 -		struct {
 -			s8 a0, a1, a2, a3;
 -		} ghz5;		/* 5GHz band */
 +		s8 a0, a1, a2, a3;
 	} antenna_gain;
 	struct {
@@ -103,7 +109,79 @@ struct ssb_sprom {
 		} ghz5;
 	} fem;
 -	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 +	u16 mcs2gpo[8];
 +	u16 mcs5gpo[8];
 +	u16 mcs5glpo[8];
 +	u16 mcs5ghpo[8];
 +	u8 opo;
 +
 +	u8 rxgainerr2ga[3];
 +	u8 rxgainerr5gla[3];
 +	u8 rxgainerr5gma[3];
 +	u8 rxgainerr5gha[3];
 +	u8 rxgainerr5gua[3];
 +
 +	u8 noiselvl2ga[3];
 +	u8 noiselvl5gla[3];
 +	u8 noiselvl5gma[3];
 +	u8 noiselvl5gha[3];
 +	u8 noiselvl5gua[3];
 +
 +	u8 regrev;
 +	u8 txchain;
 +	u8 rxchain;
 +	u8 antswitch;
 +	u16 cddpo;
 +	u16 stbcpo;
 +	u16 bw40po;
 +	u16 bwduppo;
 +
 +	u8 tempthresh;
 +	u8 tempoffset;
 +	u16 rawtempsense;
 +	u8 measpower;
 +	u8 tempsense_slope;
 +	u8 tempcorrx;
 +	u8 tempsense_option;
 +	u8 freqoffset_corr;
 +	u8 iqcal_swp_dis;
 +	u8 hw_iqcal_en;
 +	u8 elna2g;
 +	u8 elna5g;
 +	u8 phycal_tempdelta;
 +	u8 temps_period;
 +	u8 temps_hysteresis;
 +	u8 measpower1;
 +	u8 measpower2;
 +	u8 pcieingress_war;
 +
 +	/* power per rate from sromrev 9 */
 +	u16 cckbw202gpo;
 +	u16 cckbw20ul2gpo;
 +	u32 legofdmbw202gpo;
 +	u32 legofdmbw20ul2gpo;
 +	u32 legofdmbw205glpo;
 +	u32 legofdmbw20ul5glpo;
 +	u32 legofdmbw205gmpo;
 +	u32 legofdmbw20ul5gmpo;
 +	u32 legofdmbw205ghpo;
 +	u32 legofdmbw20ul5ghpo;
 +	u32 mcsbw202gpo;
 +	u32 mcsbw20ul2gpo;
 +	u32 mcsbw402gpo;
 +	u32 mcsbw205glpo;
 +	u32 mcsbw20ul5glpo;
 +	u32 mcsbw405glpo;
 +	u32 mcsbw205gmpo;
 +	u32 mcsbw20ul5gmpo;
 +	u32 mcsbw405gmpo;
 +	u32 mcsbw205ghpo;
 +	u32 mcsbw20ul5ghpo;
 +	u32 mcsbw405ghpo;
 +	u16 mcs32po;
 +	u16 legofdm40duppo;
 +	u8 sar2g;
 +	u8 sar5g;
 };
 /* Information about the PCB the circuitry is soldered on. */
 --- a/include/linux/ssb/ssb_driver_gige.h
 +++ b/include/linux/ssb/ssb_driver_gige.h
@@ -2,6 +2,7 @@
 #define LINUX_SSB_DRIVER_GIGE_H_
 #include <linux/ssb/ssb.h>
 +#include <linux/bug.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 --- a/include/linux/ssb/ssb_regs.h
 +++ b/include/linux/ssb/ssb_regs.h
@@ -449,6 +449,39 @@
--- a/target/linux/generic/patches-3.3/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.3/025-bcma_backport.patch