bcm53xx: move SPROM driver to the target files

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43604

3 files changed, 690 insertions, 1386 deletions

diff --git a/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c
new file mode 100644
index 0000000000..3221b12c29
--- /dev/null
+++ b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c
@@ -0,0 +1,690 @@
+/*
+ * BCM47xx/BCM53xx nvram variable access
+ *
+ * Copyright (C) 2005 Broadcom Corporation
+ * Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
+ * Copyright (C) 2006 Michael Buesch <m@bues.ch>
+ * Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010-2014 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * This program is free software; you can redistribute	it and/or modify it
+ * under  the terms of	the GNU General	 Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/of_address.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/of_platform.h>
+#include <linux/io.h>
+#include <linux/ssb/ssb.h>
+#include <linux/bcm47xx_nvram.h>
+#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
+
+struct bcm47xx_sprom_fill {
+	const char *prefix;
+	bool fallback;
+	int (*getenv)(const struct bcm47xx_sprom_fill *fill, const char *name,
+		      char *val, size_t val_len);
+	const void *priv;
+};
+
+static void create_key(const char *prefix, const char *postfix,
+		       const char *name, char *buf, int len)
+{
+	if (prefix && postfix)
+		snprintf(buf, len, "%s%s%s", prefix, name, postfix);
+	else if (prefix)
+		snprintf(buf, len, "%s%s", prefix, name);
+	else if (postfix)
+		snprintf(buf, len, "%s%s", name, postfix);
+	else
+		snprintf(buf, len, "%s", name);
+}
+
+static int get_nvram_var(const struct bcm47xx_sprom_fill *fill,
+			 const char *postfix, const char *name, char *buf,
+			 int len)
+{
+	char key[40];
+	int err;
+
+	create_key(fill->prefix, postfix, name, key, sizeof(key));
+
+	err = fill->getenv(fill, key, buf, len);
+	if (fill->fallback && err == -ENOENT && fill->prefix) {
+		create_key(NULL, postfix, name, key, sizeof(key));
+		err = fill->getenv(fill, key, buf, len);
+	}
+	return err;
+}
+
+#define NVRAM_READ_VAL(type)						\
+static void nvram_read_ ## type (const struct bcm47xx_sprom_fill *fill,	\
+				 const char *postfix, const char *name, \
+				 type *val, type allset)		\
+{									\
+	char buf[100];							\
+	int err;							\
+	type var;							\
+									\
+	err = get_nvram_var(fill, postfix, name, buf, sizeof(buf));	\
+	if (err < 0)							\
+		return;							\
+	err = kstrto ## type(strim(buf), 0, &var);			\
+	if (err) {							\
+		pr_warn("can not parse nvram name %s%s%s with value %s got %i\n",	\
+			fill->prefix, name, postfix, buf, err);		\
+		return;							\
+	}								\
+	if (allset && var == allset)					\
+		return;							\
+	*val = var;							\
+}
+
+NVRAM_READ_VAL(u8)
+NVRAM_READ_VAL(s8)
+NVRAM_READ_VAL(u16)
+NVRAM_READ_VAL(u32)
+
+#undef NVRAM_READ_VAL
+
+static void nvram_read_u32_2(const struct bcm47xx_sprom_fill *fill,
+			     const char *name, u16 *val_lo, u16 *val_hi)
+{
+	char buf[100];
+	int err;
+	u32 val;
+
+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
+	if (err < 0)
+		return;
+	err = kstrtou32(strim(buf), 0, &val);
+	if (err) {
+		pr_warn("can not parse nvram name %s%s with value %s got %i\n",
+			fill->prefix, name, buf, err);
+		return;
+	}
+	*val_lo = (val & 0x0000FFFFU);
+	*val_hi = (val & 0xFFFF0000U) >> 16;
+}
+
+static void nvram_read_leddc(const struct bcm47xx_sprom_fill *fill,
+			     const char *name, u8 *leddc_on_time,
+			     u8 *leddc_off_time)
+{
+	char buf[100];
+	int err;
+	u32 val;
+
+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
+	if (err < 0)
+		return;
+	err = kstrtou32(strim(buf), 0, &val);
+	if (err) {
+		pr_warn("can not parse nvram name %s%s with value %s got %i\n",
+			fill->prefix, name, buf, err);
+		return;
+	}
+
+	if (val == 0xffff || val == 0xffffffff)
+		return;
+
+	*leddc_on_time = val & 0xff;
+	*leddc_off_time = (val >> 16) & 0xff;
+}
+
+static void nvram_read_macaddr(const struct bcm47xx_sprom_fill *fill,
+			       const char *name, u8 val[6])
+{
+	char buf[100];
+	int err;
+
+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
+	if (err < 0)
+		return;
+
+	bcm47xx_nvram_parse_macaddr(buf, val);
+}
+
+static void nvram_read_alpha2(const struct bcm47xx_sprom_fill *fill,
+			      const char *name, char val[2])
+{
+	char buf[10];
+	int err;
+
+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
+	if (err < 0)
+		return;
+	if (buf[0] == '0')
+		return;
+	if (strlen(buf) > 2) {
+		pr_warn("alpha2 is too long %s\n", buf);
+		return;
+	}
+	memcpy(val, buf, 2);
+}
+
+static void bcm47xx_sprom_fill_r1234589(struct ssb_sprom *sprom,
+					const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u16(fill, NULL, "devid", &sprom->dev_id, 0);
+	nvram_read_u8(fill, NULL, "ledbh0", &sprom->gpio0, 0xff);
+	nvram_read_u8(fill, NULL, "ledbh1", &sprom->gpio1, 0xff);
+	nvram_read_u8(fill, NULL, "ledbh2", &sprom->gpio2, 0xff);
+	nvram_read_u8(fill, NULL, "ledbh3", &sprom->gpio3, 0xff);
+	nvram_read_u8(fill, NULL, "aa2g", &sprom->ant_available_bg, 0);
+	nvram_read_u8(fill, NULL, "aa5g", &sprom->ant_available_a, 0);
+	nvram_read_s8(fill, NULL, "ag0", &sprom->antenna_gain.a0, 0);
+	nvram_read_s8(fill, NULL, "ag1", &sprom->antenna_gain.a1, 0);
+	nvram_read_alpha2(fill, "ccode", sprom->alpha2);
+}
+
+static void bcm47xx_sprom_fill_r12389(struct ssb_sprom *sprom,
+				      const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u16(fill, NULL, "pa0b0", &sprom->pa0b0, 0);
+	nvram_read_u16(fill, NULL, "pa0b1", &sprom->pa0b1, 0);
+	nvram_read_u16(fill, NULL, "pa0b2", &sprom->pa0b2, 0);
+	nvram_read_u8(fill, NULL, "pa0itssit", &sprom->itssi_bg, 0);
+	nvram_read_u8(fill, NULL, "pa0maxpwr", &sprom->maxpwr_bg, 0);
+	nvram_read_u16(fill, NULL, "pa1b0", &sprom->pa1b0, 0);
+	nvram_read_u16(fill, NULL, "pa1b1", &sprom->pa1b1, 0);
+	nvram_read_u16(fill, NULL, "pa1b2", &sprom->pa1b2, 0);
+	nvram_read_u8(fill, NULL, "pa1itssit", &sprom->itssi_a, 0);
+	nvram_read_u8(fill, NULL, "pa1maxpwr", &sprom->maxpwr_a, 0);
+}
+
+static void bcm47xx_sprom_fill_r1(struct ssb_sprom *sprom,
+				  const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u16(fill, NULL, "boardflags", &sprom->boardflags_lo, 0);
+	nvram_read_u8(fill, NULL, "cc", &sprom->country_code, 0);
+}
+
+static void bcm47xx_sprom_fill_r2389(struct ssb_sprom *sprom,
+				     const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u8(fill, NULL, "opo", &sprom->opo, 0);
+	nvram_read_u16(fill, NULL, "pa1lob0", &sprom->pa1lob0, 0);
+	nvram_read_u16(fill, NULL, "pa1lob1", &sprom->pa1lob1, 0);
+	nvram_read_u16(fill, NULL, "pa1lob2", &sprom->pa1lob2, 0);
+	nvram_read_u16(fill, NULL, "pa1hib0", &sprom->pa1hib0, 0);
+	nvram_read_u16(fill, NULL, "pa1hib1", &sprom->pa1hib1, 0);
+	nvram_read_u16(fill, NULL, "pa1hib2", &sprom->pa1hib2, 0);
+	nvram_read_u8(fill, NULL, "pa1lomaxpwr", &sprom->maxpwr_al, 0);
+	nvram_read_u8(fill, NULL, "pa1himaxpwr", &sprom->maxpwr_ah, 0);
+}
+
+static void bcm47xx_sprom_fill_r389(struct ssb_sprom *sprom,
+				    const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u8(fill, NULL, "bxa2g", &sprom->bxa2g, 0);
+	nvram_read_u8(fill, NULL, "rssisav2g", &sprom->rssisav2g, 0);
+	nvram_read_u8(fill, NULL, "rssismc2g", &sprom->rssismc2g, 0);
+	nvram_read_u8(fill, NULL, "rssismf2g", &sprom->rssismf2g, 0);
+	nvram_read_u8(fill, NULL, "bxa5g", &sprom->bxa5g, 0);
+	nvram_read_u8(fill, NULL, "rssisav5g", &sprom->rssisav5g, 0);
+	nvram_read_u8(fill, NULL, "rssismc5g", &sprom->rssismc5g, 0);
+	nvram_read_u8(fill, NULL, "rssismf5g", &sprom->rssismf5g, 0);
+	nvram_read_u8(fill, NULL, "tri2g", &sprom->tri2g, 0);
+	nvram_read_u8(fill, NULL, "tri5g", &sprom->tri5g, 0);
+	nvram_read_u8(fill, NULL, "tri5gl", &sprom->tri5gl, 0);
+	nvram_read_u8(fill, NULL, "tri5gh", &sprom->tri5gh, 0);
+	nvram_read_s8(fill, NULL, "rxpo2g", &sprom->rxpo2g, 0);
+	nvram_read_s8(fill, NULL, "rxpo5g", &sprom->rxpo5g, 0);
+}
+
+static void bcm47xx_sprom_fill_r3(struct ssb_sprom *sprom,
+				  const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u8(fill, NULL, "regrev", &sprom->regrev, 0);
+	nvram_read_leddc(fill, "leddc", &sprom->leddc_on_time,
+			 &sprom->leddc_off_time);
+}
+
+static void bcm47xx_sprom_fill_r4589(struct ssb_sprom *sprom,
+				     const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u8(fill, NULL, "regrev", &sprom->regrev, 0);
+	nvram_read_s8(fill, NULL, "ag2", &sprom->antenna_gain.a2, 0);
+	nvram_read_s8(fill, NULL, "ag3", &sprom->antenna_gain.a3, 0);
+	nvram_read_u8(fill, NULL, "txchain", &sprom->txchain, 0xf);
+	nvram_read_u8(fill, NULL, "rxchain", &sprom->rxchain, 0xf);
+	nvram_read_u8(fill, NULL, "antswitch", &sprom->antswitch, 0xff);
+	nvram_read_leddc(fill, "leddc", &sprom->leddc_on_time,
+			 &sprom->leddc_off_time);
+}
+
+static void bcm47xx_sprom_fill_r458(struct ssb_sprom *sprom,
+				    const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u16(fill, NULL, "cck2gpo", &sprom->cck2gpo, 0);
+	nvram_read_u32(fill, NULL, "ofdm2gpo", &sprom->ofdm2gpo, 0);
+	nvram_read_u32(fill, NULL, "ofdm5gpo", &sprom->ofdm5gpo, 0);
+	nvram_read_u32(fill, NULL, "ofdm5glpo", &sprom->ofdm5glpo, 0);
+	nvram_read_u32(fill, NULL, "ofdm5ghpo", &sprom->ofdm5ghpo, 0);
+	nvram_read_u16(fill, NULL, "cddpo", &sprom->cddpo, 0);
+	nvram_read_u16(fill, NULL, "stbcpo", &sprom->stbcpo, 0);
+	nvram_read_u16(fill, NULL, "bw40po", &sprom->bw40po, 0);
+	nvram_read_u16(fill, NULL, "bwduppo", &sprom->bwduppo, 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo0", &sprom->mcs2gpo[0], 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo1", &sprom->mcs2gpo[1], 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo2", &sprom->mcs2gpo[2], 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo3", &sprom->mcs2gpo[3], 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo4", &sprom->mcs2gpo[4], 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo5", &sprom->mcs2gpo[5], 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo6", &sprom->mcs2gpo[6], 0);
+	nvram_read_u16(fill, NULL, "mcs2gpo7", &sprom->mcs2gpo[7], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo0", &sprom->mcs5gpo[0], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo1", &sprom->mcs5gpo[1], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo2", &sprom->mcs5gpo[2], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo3", &sprom->mcs5gpo[3], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo4", &sprom->mcs5gpo[4], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo5", &sprom->mcs5gpo[5], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo6", &sprom->mcs5gpo[6], 0);
+	nvram_read_u16(fill, NULL, "mcs5gpo7", &sprom->mcs5gpo[7], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo0", &sprom->mcs5glpo[0], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo1", &sprom->mcs5glpo[1], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo2", &sprom->mcs5glpo[2], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo3", &sprom->mcs5glpo[3], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo4", &sprom->mcs5glpo[4], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo5", &sprom->mcs5glpo[5], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo6", &sprom->mcs5glpo[6], 0);
+	nvram_read_u16(fill, NULL, "mcs5glpo7", &sprom->mcs5glpo[7], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo0", &sprom->mcs5ghpo[0], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo1", &sprom->mcs5ghpo[1], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo2", &sprom->mcs5ghpo[2], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo3", &sprom->mcs5ghpo[3], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo4", &sprom->mcs5ghpo[4], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo5", &sprom->mcs5ghpo[5], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo6", &sprom->mcs5ghpo[6], 0);
+	nvram_read_u16(fill, NULL, "mcs5ghpo7", &sprom->mcs5ghpo[7], 0);
+}
+
+static void bcm47xx_sprom_fill_r45(struct ssb_sprom *sprom,
+				   const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u8(fill, NULL, "txpid2ga0", &sprom->txpid2g[0], 0);
+	nvram_read_u8(fill, NULL, "txpid2ga1", &sprom->txpid2g[1], 0);
+	nvram_read_u8(fill, NULL, "txpid2ga2", &sprom->txpid2g[2], 0);
+	nvram_read_u8(fill, NULL, "txpid2ga3", &sprom->txpid2g[3], 0);
+	nvram_read_u8(fill, NULL, "txpid5ga0", &sprom->txpid5g[0], 0);
+	nvram_read_u8(fill, NULL, "txpid5ga1", &sprom->txpid5g[1], 0);
+	nvram_read_u8(fill, NULL, "txpid5ga2", &sprom->txpid5g[2], 0);
+	nvram_read_u8(fill, NULL, "txpid5ga3", &sprom->txpid5g[3], 0);
+	nvram_read_u8(fill, NULL, "txpid5gla0", &sprom->txpid5gl[0], 0);
+	nvram_read_u8(fill, NULL, "txpid5gla1", &sprom->txpid5gl[1], 0);
+	nvram_read_u8(fill, NULL, "txpid5gla2", &sprom->txpid5gl[2], 0);
+	nvram_read_u8(fill, NULL, "txpid5gla3", &sprom->txpid5gl[3], 0);
+	nvram_read_u8(fill, NULL, "txpid5gha0", &sprom->txpid5gh[0], 0);
+	nvram_read_u8(fill, NULL, "txpid5gha1", &sprom->txpid5gh[1], 0);
+	nvram_read_u8(fill, NULL, "txpid5gha2", &sprom->txpid5gh[2], 0);
+	nvram_read_u8(fill, NULL, "txpid5gha3", &sprom->txpid5gh[3], 0);
+}
+
+static void bcm47xx_sprom_fill_r89(struct ssb_sprom *sprom,
+				   const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u8(fill, NULL, "tssipos2g", &sprom->fem.ghz2.tssipos, 0);
+	nvram_read_u8(fill, NULL, "extpagain2g", &sprom->fem.ghz2.extpa_gain, 0);
+	nvram_read_u8(fill, NULL, "pdetrange2g", &sprom->fem.ghz2.pdet_range, 0);
+	nvram_read_u8(fill, NULL, "triso2g", &sprom->fem.ghz2.tr_iso, 0);
+	nvram_read_u8(fill, NULL, "antswctl2g", &sprom->fem.ghz2.antswlut, 0);
+	nvram_read_u8(fill, NULL, "tssipos5g", &sprom->fem.ghz5.tssipos, 0);
+	nvram_read_u8(fill, NULL, "extpagain5g", &sprom->fem.ghz5.extpa_gain, 0);
+	nvram_read_u8(fill, NULL, "pdetrange5g", &sprom->fem.ghz5.pdet_range, 0);
+	nvram_read_u8(fill, NULL, "triso5g", &sprom->fem.ghz5.tr_iso, 0);
+	nvram_read_u8(fill, NULL, "antswctl5g", &sprom->fem.ghz5.antswlut, 0);
+	nvram_read_u8(fill, NULL, "tempthresh", &sprom->tempthresh, 0);
+	nvram_read_u8(fill, NULL, "tempoffset", &sprom->tempoffset, 0);
+	nvram_read_u16(fill, NULL, "rawtempsense", &sprom->rawtempsense, 0);
+	nvram_read_u8(fill, NULL, "measpower", &sprom->measpower, 0);
+	nvram_read_u8(fill, NULL, "tempsense_slope", &sprom->tempsense_slope, 0);
+	nvram_read_u8(fill, NULL, "tempcorrx", &sprom->tempcorrx, 0);
+	nvram_read_u8(fill, NULL, "tempsense_option", &sprom->tempsense_option, 0);
+	nvram_read_u8(fill, NULL, "freqoffset_corr", &sprom->freqoffset_corr, 0);
+	nvram_read_u8(fill, NULL, "iqcal_swp_dis", &sprom->iqcal_swp_dis, 0);
+	nvram_read_u8(fill, NULL, "hw_iqcal_en", &sprom->hw_iqcal_en, 0);
+	nvram_read_u8(fill, NULL, "elna2g", &sprom->elna2g, 0);
+	nvram_read_u8(fill, NULL, "elna5g", &sprom->elna5g, 0);
+	nvram_read_u8(fill, NULL, "phycal_tempdelta", &sprom->phycal_tempdelta, 0);
+	nvram_read_u8(fill, NULL, "temps_period", &sprom->temps_period, 0);
+	nvram_read_u8(fill, NULL, "temps_hysteresis", &sprom->temps_hysteresis, 0);
+	nvram_read_u8(fill, NULL, "measpower1", &sprom->measpower1, 0);
+	nvram_read_u8(fill, NULL, "measpower2", &sprom->measpower2, 0);
+	nvram_read_u8(fill, NULL, "rxgainerr2ga0", &sprom->rxgainerr2ga[0], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr2ga1", &sprom->rxgainerr2ga[1], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr2ga2", &sprom->rxgainerr2ga[2], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gla0", &sprom->rxgainerr5gla[0], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gla1", &sprom->rxgainerr5gla[1], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gla2", &sprom->rxgainerr5gla[2], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gma0", &sprom->rxgainerr5gma[0], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gma1", &sprom->rxgainerr5gma[1], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gma2", &sprom->rxgainerr5gma[2], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gha0", &sprom->rxgainerr5gha[0], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gha1", &sprom->rxgainerr5gha[1], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gha2", &sprom->rxgainerr5gha[2], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gua0", &sprom->rxgainerr5gua[0], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gua1", &sprom->rxgainerr5gua[1], 0);
+	nvram_read_u8(fill, NULL, "rxgainerr5gua2", &sprom->rxgainerr5gua[2], 0);
+	nvram_read_u8(fill, NULL, "noiselvl2ga0", &sprom->noiselvl2ga[0], 0);
+	nvram_read_u8(fill, NULL, "noiselvl2ga1", &sprom->noiselvl2ga[1], 0);
+	nvram_read_u8(fill, NULL, "noiselvl2ga2", &sprom->noiselvl2ga[2], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gla0", &sprom->noiselvl5gla[0], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gla1", &sprom->noiselvl5gla[1], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gla2", &sprom->noiselvl5gla[2], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gma0", &sprom->noiselvl5gma[0], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gma1", &sprom->noiselvl5gma[1], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gma2", &sprom->noiselvl5gma[2], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gha0", &sprom->noiselvl5gha[0], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gha1", &sprom->noiselvl5gha[1], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gha2", &sprom->noiselvl5gha[2], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gua0", &sprom->noiselvl5gua[0], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gua1", &sprom->noiselvl5gua[1], 0);
+	nvram_read_u8(fill, NULL, "noiselvl5gua2", &sprom->noiselvl5gua[2], 0);
+	nvram_read_u8(fill, NULL, "pcieingress_war", &sprom->pcieingress_war, 0);
+}
+
+static void bcm47xx_sprom_fill_r9(struct ssb_sprom *sprom,
+				  const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u16(fill, NULL, "cckbw202gpo", &sprom->cckbw202gpo, 0);
+	nvram_read_u16(fill, NULL, "cckbw20ul2gpo", &sprom->cckbw20ul2gpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw202gpo", &sprom->legofdmbw202gpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw20ul2gpo", &sprom->legofdmbw20ul2gpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw205glpo", &sprom->legofdmbw205glpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw20ul5glpo", &sprom->legofdmbw20ul5glpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw205gmpo", &sprom->legofdmbw205gmpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw20ul5gmpo", &sprom->legofdmbw20ul5gmpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw205ghpo", &sprom->legofdmbw205ghpo, 0);
+	nvram_read_u32(fill, NULL, "legofdmbw20ul5ghpo", &sprom->legofdmbw20ul5ghpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw202gpo", &sprom->mcsbw202gpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw20ul2gpo", &sprom->mcsbw20ul2gpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw402gpo", &sprom->mcsbw402gpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw205glpo", &sprom->mcsbw205glpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw20ul5glpo", &sprom->mcsbw20ul5glpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw405glpo", &sprom->mcsbw405glpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw205gmpo", &sprom->mcsbw205gmpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw20ul5gmpo", &sprom->mcsbw20ul5gmpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw405gmpo", &sprom->mcsbw405gmpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw205ghpo", &sprom->mcsbw205ghpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw20ul5ghpo", &sprom->mcsbw20ul5ghpo, 0);
+	nvram_read_u32(fill, NULL, "mcsbw405ghpo", &sprom->mcsbw405ghpo, 0);
+	nvram_read_u16(fill, NULL, "mcs32po", &sprom->mcs32po, 0);
+	nvram_read_u16(fill, NULL, "legofdm40duppo", &sprom->legofdm40duppo, 0);
+	nvram_read_u8(fill, NULL, "sar2g", &sprom->sar2g, 0);
+	nvram_read_u8(fill, NULL, "sar5g", &sprom->sar5g, 0);
+}
+
+static void bcm47xx_sprom_fill_path_r4589(struct ssb_sprom *sprom,
+					  const struct bcm47xx_sprom_fill *fill)
+{
+	char postfix[2];
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
+		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
+
+		snprintf(postfix, sizeof(postfix), "%i", i);
+		nvram_read_u8(fill, postfix, "maxp2ga", &pwr_info->maxpwr_2g, 0);
+		nvram_read_u8(fill, postfix, "itt2ga", &pwr_info->itssi_2g, 0);
+		nvram_read_u8(fill, postfix, "itt5ga", &pwr_info->itssi_5g, 0);
+		nvram_read_u16(fill, postfix, "pa2gw0a", &pwr_info->pa_2g[0], 0);
+		nvram_read_u16(fill, postfix, "pa2gw1a", &pwr_info->pa_2g[1], 0);
+		nvram_read_u16(fill, postfix, "pa2gw2a", &pwr_info->pa_2g[2], 0);
+		nvram_read_u8(fill, postfix, "maxp5ga", &pwr_info->maxpwr_5g, 0);
+		nvram_read_u8(fill, postfix, "maxp5gha", &pwr_info->maxpwr_5gh, 0);
+		nvram_read_u8(fill, postfix, "maxp5gla", &pwr_info->maxpwr_5gl, 0);
+		nvram_read_u16(fill, postfix, "pa5gw0a", &pwr_info->pa_5g[0], 0);
+		nvram_read_u16(fill, postfix, "pa5gw1a", &pwr_info->pa_5g[1], 0);
+		nvram_read_u16(fill, postfix, "pa5gw2a", &pwr_info->pa_5g[2], 0);
+		nvram_read_u16(fill, postfix, "pa5glw0a", &pwr_info->pa_5gl[0], 0);
+		nvram_read_u16(fill, postfix, "pa5glw1a", &pwr_info->pa_5gl[1], 0);
+		nvram_read_u16(fill, postfix, "pa5glw2a", &pwr_info->pa_5gl[2], 0);
+		nvram_read_u16(fill, postfix, "pa5ghw0a", &pwr_info->pa_5gh[0], 0);
+		nvram_read_u16(fill, postfix, "pa5ghw1a", &pwr_info->pa_5gh[1], 0);
+		nvram_read_u16(fill, postfix, "pa5ghw2a", &pwr_info->pa_5gh[2], 0);
+	}
+}
+
+static void bcm47xx_sprom_fill_path_r45(struct ssb_sprom *sprom,
+					const struct bcm47xx_sprom_fill *fill)
+{
+	char postfix[2];
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
+		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
+
+		snprintf(postfix, sizeof(postfix), "%i", i);
+		nvram_read_u16(fill, postfix, "pa2gw3a", &pwr_info->pa_2g[3], 0);
+		nvram_read_u16(fill, postfix, "pa5gw3a", &pwr_info->pa_5g[3], 0);
+		nvram_read_u16(fill, postfix, "pa5glw3a", &pwr_info->pa_5gl[3], 0);
+		nvram_read_u16(fill, postfix, "pa5ghw3a", &pwr_info->pa_5gh[3], 0);
+	}
+}
+
+static bool bcm47xx_is_valid_mac(u8 *mac)
+{
+	return mac && !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c);
+}
+
+static int bcm47xx_increase_mac_addr(u8 *mac, u8 num)
+{
+	u8 *oui = mac + ETH_ALEN/2 - 1;
+	u8 *p = mac + ETH_ALEN - 1;
+
+	do {
+		(*p) += num;
+		if (*p > num)
+			break;
+		p--;
+		num = 1;
+	} while (p != oui);
+
+	if (p == oui) {
+		pr_err("unable to fetch mac address\n");
+		return -ENOENT;
+	}
+	return 0;
+}
+
+/*
+ * This is a global counter because different instances of sprom will
+ * access the same nvram.
+ */
+static int mac_addr_used = 2;
+
+static void bcm47xx_sprom_fill_ethernet(struct ssb_sprom *sprom,
+					const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_macaddr(fill, "et0macaddr", sprom->et0mac);
+	nvram_read_u8(fill, NULL, "et0mdcport", &sprom->et0mdcport, 0);
+	nvram_read_u8(fill, NULL, "et0phyaddr", &sprom->et0phyaddr, 0);
+
+	nvram_read_macaddr(fill, "et1macaddr", sprom->et1mac);
+	nvram_read_u8(fill, NULL, "et1mdcport", &sprom->et1mdcport, 0);
+	nvram_read_u8(fill, NULL, "et1phyaddr", &sprom->et1phyaddr, 0);
+
+	nvram_read_macaddr(fill, "macaddr", sprom->il0mac);
+	nvram_read_macaddr(fill, "il0macaddr", sprom->il0mac);
+
+	/*
+	 * The address prefix 00:90:4C is used by Broadcom in their initial
+	 * configuration. When a mac address with the prefix 00:90:4C is used
+	 * all devices from the same series are sharing the same mac address.
+	 * To prevent mac address collisions we replace them with a mac address
+	 * based on the base address.
+	 */
+	if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
+		u8 mac[6];
+		struct bcm47xx_sprom_fill fill_no_prefix;
+
+		memcpy(&fill_no_prefix, fill, sizeof(fill_no_prefix));
+		fill_no_prefix.prefix = NULL;
+
+		nvram_read_macaddr(&fill_no_prefix, "et0macaddr", mac);
+		if (bcm47xx_is_valid_mac(mac)) {
+			int err = bcm47xx_increase_mac_addr(mac, mac_addr_used);
+
+			if (!err) {
+				ether_addr_copy(sprom->il0mac, mac);
+				mac_addr_used++;
+			}
+		}
+	}
+}
+
+static void bcm47xx_sprom_fill_board_data(struct ssb_sprom *sprom,
+					  const struct bcm47xx_sprom_fill *fill)
+{
+	nvram_read_u16(fill, NULL, "boardrev", &sprom->board_rev, 0);
+	nvram_read_u16(fill, NULL, "boardnum", &sprom->board_num, 0);
+	nvram_read_u16(fill, NULL, "boardtype", &sprom->board_type, 0);
+	nvram_read_u32_2(fill, "boardflags", &sprom->boardflags_lo,
+			 &sprom->boardflags_hi);
+	nvram_read_u32_2(fill, "boardflags2", &sprom->boardflags2_lo,
+			 &sprom->boardflags2_hi);
+}
+
+static void bcm47xx_sprom_fill(struct ssb_sprom *sprom,
+			       const struct bcm47xx_sprom_fill *fill)
+{
+	bcm47xx_sprom_fill_ethernet(sprom, fill);
+	bcm47xx_sprom_fill_board_data(sprom, fill);
+
+	nvram_read_u8(fill, NULL, "sromrev", &sprom->revision, 0);
+
+	switch (sprom->revision) {
+	case 1:
+		bcm47xx_sprom_fill_r1234589(sprom, fill);
+		bcm47xx_sprom_fill_r12389(sprom, fill);
+		bcm47xx_sprom_fill_r1(sprom, fill);
+		break;
+	case 2:
+		bcm47xx_sprom_fill_r1234589(sprom, fill);
+		bcm47xx_sprom_fill_r12389(sprom, fill);
+		bcm47xx_sprom_fill_r2389(sprom, fill);
+		break;
+	case 3:
+		bcm47xx_sprom_fill_r1234589(sprom, fill);
+		bcm47xx_sprom_fill_r12389(sprom, fill);
+		bcm47xx_sprom_fill_r2389(sprom, fill);
+		bcm47xx_sprom_fill_r389(sprom, fill);
+		bcm47xx_sprom_fill_r3(sprom, fill);
+		break;
+	case 4:
+	case 5:
+		bcm47xx_sprom_fill_r1234589(sprom, fill);
+		bcm47xx_sprom_fill_r4589(sprom, fill);
+		bcm47xx_sprom_fill_r458(sprom, fill);
+		bcm47xx_sprom_fill_r45(sprom, fill);
+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
+		bcm47xx_sprom_fill_path_r45(sprom, fill);
+		break;
+	case 8:
+		bcm47xx_sprom_fill_r1234589(sprom, fill);
+		bcm47xx_sprom_fill_r12389(sprom, fill);
+		bcm47xx_sprom_fill_r2389(sprom, fill);
+		bcm47xx_sprom_fill_r389(sprom, fill);
+		bcm47xx_sprom_fill_r4589(sprom, fill);
+		bcm47xx_sprom_fill_r458(sprom, fill);
+		bcm47xx_sprom_fill_r89(sprom, fill);
+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
+		break;
+	case 9:
+		bcm47xx_sprom_fill_r1234589(sprom, fill);
+		bcm47xx_sprom_fill_r12389(sprom, fill);
+		bcm47xx_sprom_fill_r2389(sprom, fill);
+		bcm47xx_sprom_fill_r389(sprom, fill);
+		bcm47xx_sprom_fill_r4589(sprom, fill);
+		bcm47xx_sprom_fill_r89(sprom, fill);
+		bcm47xx_sprom_fill_r9(sprom, fill);
+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
+		break;
+	default:
+		pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
+			sprom->revision);
+		sprom->revision = 1;
+		bcm47xx_sprom_fill_r1234589(sprom, fill);
+		bcm47xx_sprom_fill_r12389(sprom, fill);
+		bcm47xx_sprom_fill_r1(sprom, fill);
+	}
+}
+
+static int bcm47xx_sprom_getenv(const struct bcm47xx_sprom_fill *fill,
+				const char *name, char *val, size_t val_len)
+{
+	const struct platform_device *nvram_dev = fill->priv;
+
+	return bcm47xx_nvram_getenv(&nvram_dev->dev, name, val, val_len);
+};
+
+static int bcm47xx_sprom_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
+	struct ssb_sprom *sprom;
+	const __be32 *handle;
+	struct device_node *nvram_node;
+	struct platform_device *nvram_dev;
+	struct bcm47xx_sprom_fill fill;
+
+	/* Alloc */
+	sprom = devm_kzalloc(dev, sizeof(*sprom), GFP_KERNEL);
+	if (!sprom)
+		return -ENOMEM;
+
+	handle = of_get_property(np, "nvram", NULL);
+	if (!handle)
+		return -ENOMEM;
+
+	nvram_node = of_find_node_by_phandle(be32_to_cpup(handle));
+	if (!nvram_node)
+		return -ENOMEM;
+
+	nvram_dev = of_find_device_by_node(nvram_node);
+	if (!nvram_dev)
+		return -ENOMEM;
+
+	fill.prefix = of_get_property(np, "prefix", NULL);
+
+	fill.fallback = false;
+	fill.getenv = bcm47xx_sprom_getenv;
+	fill.priv = nvram_dev;
+
+	bcm47xx_sprom_fill(sprom, &fill);
+
+	platform_set_drvdata(pdev, sprom);
+
+	return 0;
+}
+
+static const struct of_device_id bcm47xx_sprom_of_match_table[] = {
+	{ .compatible = "brcm,bcm47xx-sprom", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
+
+static struct platform_driver bcm47xx_sprom_driver = {
+	.driver = {
+		.owner = THIS_MODULE,
+		.name = "bcm47xx-sprom",
+		.of_match_table = bcm47xx_sprom_of_match_table,
+		/* driver unloading/unbinding currently not supported */
+		.suppress_bind_attrs = true,
+	},
+	.probe = bcm47xx_sprom_probe,
+};
+module_platform_driver(bcm47xx_sprom_driver);
+
+MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>");
+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm53xx/patches-3.14/112-bcm53xx-sprom-add-sprom-driver.patch b/target/linux/bcm53xx/patches-3.14/112-bcm53xx-sprom-add-sprom-driver.patch
index e0698ec869..739d8cf90d 100644
--- a/target/linux/bcm53xx/patches-3.14/112-bcm53xx-sprom-add-sprom-driver.patch
+++ b/target/linux/bcm53xx/patches-3.14/112-bcm53xx-sprom-add-sprom-driver.patch
@@ -67,696 +67,3 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  obj-$(CONFIG_GENWQE)		+= genwqe/
  obj-$(CONFIG_BCM47XX_NVRAM)	+= bcm47xx-nvram.o
 +obj-$(CONFIG_BCM47XX_SPROM)	+= bcm47xx-sprom.o
---- /dev/null
-+++ b/drivers/misc/bcm47xx-sprom.c
-@@ -0,0 +1,690 @@
-+/*
-+ * BCM47xx/BCM53xx nvram variable access
-+ *
-+ * Copyright (C) 2005 Broadcom Corporation
-+ * Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
-+ * Copyright (C) 2006 Michael Buesch <m@bues.ch>
-+ * Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-+ * Copyright (C) 2010-2014 Hauke Mehrtens <hauke@hauke-m.de>
-+ *
-+ * This program is free software; you can redistribute	it and/or modify it
-+ * under  the terms of	the GNU General	 Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/of_address.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/of_platform.h>
-+#include <linux/io.h>
-+#include <linux/ssb/ssb.h>
-+#include <linux/bcm47xx_nvram.h>
-+#include <linux/if_ether.h>
-+#include <linux/etherdevice.h>
-+
-+struct bcm47xx_sprom_fill {
-+	const char *prefix;
-+	bool fallback;
-+	int (*getenv)(const struct bcm47xx_sprom_fill *fill, const char *name,
-+		      char *val, size_t val_len);
-+	const void *priv;
-+};
-+
-+static void create_key(const char *prefix, const char *postfix,
-+		       const char *name, char *buf, int len)
-+{
-+	if (prefix && postfix)
-+		snprintf(buf, len, "%s%s%s", prefix, name, postfix);
-+	else if (prefix)
-+		snprintf(buf, len, "%s%s", prefix, name);
-+	else if (postfix)
-+		snprintf(buf, len, "%s%s", name, postfix);
-+	else
-+		snprintf(buf, len, "%s", name);
-+}
-+
-+static int get_nvram_var(const struct bcm47xx_sprom_fill *fill,
-+			 const char *postfix, const char *name, char *buf,
-+			 int len)
-+{
-+	char key[40];
-+	int err;
-+
-+	create_key(fill->prefix, postfix, name, key, sizeof(key));
-+
-+	err = fill->getenv(fill, key, buf, len);
-+	if (fill->fallback && err == -ENOENT && fill->prefix) {
-+		create_key(NULL, postfix, name, key, sizeof(key));
-+		err = fill->getenv(fill, key, buf, len);
-+	}
-+	return err;
-+}
-+
-+#define NVRAM_READ_VAL(type)						\
-+static void nvram_read_ ## type (const struct bcm47xx_sprom_fill *fill,	\
-+				 const char *postfix, const char *name, \
-+				 type *val, type allset)		\
-+{									\
-+	char buf[100];							\
-+	int err;							\
-+	type var;							\
-+									\
-+	err = get_nvram_var(fill, postfix, name, buf, sizeof(buf));	\
-+	if (err < 0)							\
-+		return;							\
-+	err = kstrto ## type(strim(buf), 0, &var);			\
-+	if (err) {							\
-+		pr_warn("can not parse nvram name %s%s%s with value %s got %i\n",	\
-+			fill->prefix, name, postfix, buf, err);		\
-+		return;							\
-+	}								\
-+	if (allset && var == allset)					\
-+		return;							\
-+	*val = var;							\
-+}
-+
-+NVRAM_READ_VAL(u8)
-+NVRAM_READ_VAL(s8)
-+NVRAM_READ_VAL(u16)
-+NVRAM_READ_VAL(u32)
-+
-+#undef NVRAM_READ_VAL
-+
-+static void nvram_read_u32_2(const struct bcm47xx_sprom_fill *fill,
-+			     const char *name, u16 *val_lo, u16 *val_hi)
-+{
-+	char buf[100];
-+	int err;
-+	u32 val;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+	err = kstrtou32(strim(buf), 0, &val);
-+	if (err) {
-+		pr_warn("can not parse nvram name %s%s with value %s got %i\n",
-+			fill->prefix, name, buf, err);
-+		return;
-+	}
-+	*val_lo = (val & 0x0000FFFFU);
-+	*val_hi = (val & 0xFFFF0000U) >> 16;
-+}
-+
-+static void nvram_read_leddc(const struct bcm47xx_sprom_fill *fill,
-+			     const char *name, u8 *leddc_on_time,
-+			     u8 *leddc_off_time)
-+{
-+	char buf[100];
-+	int err;
-+	u32 val;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+	err = kstrtou32(strim(buf), 0, &val);
-+	if (err) {
-+		pr_warn("can not parse nvram name %s%s with value %s got %i\n",
-+			fill->prefix, name, buf, err);
-+		return;
-+	}
-+
-+	if (val == 0xffff || val == 0xffffffff)
-+		return;
-+
-+	*leddc_on_time = val & 0xff;
-+	*leddc_off_time = (val >> 16) & 0xff;
-+}
-+
-+static void nvram_read_macaddr(const struct bcm47xx_sprom_fill *fill,
-+			       const char *name, u8 val[6])
-+{
-+	char buf[100];
-+	int err;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+
-+	bcm47xx_nvram_parse_macaddr(buf, val);
-+}
-+
-+static void nvram_read_alpha2(const struct bcm47xx_sprom_fill *fill,
-+			      const char *name, char val[2])
-+{
-+	char buf[10];
-+	int err;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+	if (buf[0] == '0')
-+		return;
-+	if (strlen(buf) > 2) {
-+		pr_warn("alpha2 is too long %s\n", buf);
-+		return;
-+	}
-+	memcpy(val, buf, 2);
-+}
-+
-+static void bcm47xx_sprom_fill_r1234589(struct ssb_sprom *sprom,
-+					const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "devid", &sprom->dev_id, 0);
-+	nvram_read_u8(fill, NULL, "ledbh0", &sprom->gpio0, 0xff);
-+	nvram_read_u8(fill, NULL, "ledbh1", &sprom->gpio1, 0xff);
-+	nvram_read_u8(fill, NULL, "ledbh2", &sprom->gpio2, 0xff);
-+	nvram_read_u8(fill, NULL, "ledbh3", &sprom->gpio3, 0xff);
-+	nvram_read_u8(fill, NULL, "aa2g", &sprom->ant_available_bg, 0);
-+	nvram_read_u8(fill, NULL, "aa5g", &sprom->ant_available_a, 0);
-+	nvram_read_s8(fill, NULL, "ag0", &sprom->antenna_gain.a0, 0);
-+	nvram_read_s8(fill, NULL, "ag1", &sprom->antenna_gain.a1, 0);
-+	nvram_read_alpha2(fill, "ccode", sprom->alpha2);
-+}
-+
-+static void bcm47xx_sprom_fill_r12389(struct ssb_sprom *sprom,
-+				      const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "pa0b0", &sprom->pa0b0, 0);
-+	nvram_read_u16(fill, NULL, "pa0b1", &sprom->pa0b1, 0);
-+	nvram_read_u16(fill, NULL, "pa0b2", &sprom->pa0b2, 0);
-+	nvram_read_u8(fill, NULL, "pa0itssit", &sprom->itssi_bg, 0);
-+	nvram_read_u8(fill, NULL, "pa0maxpwr", &sprom->maxpwr_bg, 0);
-+	nvram_read_u16(fill, NULL, "pa1b0", &sprom->pa1b0, 0);
-+	nvram_read_u16(fill, NULL, "pa1b1", &sprom->pa1b1, 0);
-+	nvram_read_u16(fill, NULL, "pa1b2", &sprom->pa1b2, 0);
-+	nvram_read_u8(fill, NULL, "pa1itssit", &sprom->itssi_a, 0);
-+	nvram_read_u8(fill, NULL, "pa1maxpwr", &sprom->maxpwr_a, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r1(struct ssb_sprom *sprom,
-+				  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "boardflags", &sprom->boardflags_lo, 0);
-+	nvram_read_u8(fill, NULL, "cc", &sprom->country_code, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r2389(struct ssb_sprom *sprom,
-+				     const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "opo", &sprom->opo, 0);
-+	nvram_read_u16(fill, NULL, "pa1lob0", &sprom->pa1lob0, 0);
-+	nvram_read_u16(fill, NULL, "pa1lob1", &sprom->pa1lob1, 0);
-+	nvram_read_u16(fill, NULL, "pa1lob2", &sprom->pa1lob2, 0);
-+	nvram_read_u16(fill, NULL, "pa1hib0", &sprom->pa1hib0, 0);
-+	nvram_read_u16(fill, NULL, "pa1hib1", &sprom->pa1hib1, 0);
-+	nvram_read_u16(fill, NULL, "pa1hib2", &sprom->pa1hib2, 0);
-+	nvram_read_u8(fill, NULL, "pa1lomaxpwr", &sprom->maxpwr_al, 0);
-+	nvram_read_u8(fill, NULL, "pa1himaxpwr", &sprom->maxpwr_ah, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r389(struct ssb_sprom *sprom,
-+				    const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "bxa2g", &sprom->bxa2g, 0);
-+	nvram_read_u8(fill, NULL, "rssisav2g", &sprom->rssisav2g, 0);
-+	nvram_read_u8(fill, NULL, "rssismc2g", &sprom->rssismc2g, 0);
-+	nvram_read_u8(fill, NULL, "rssismf2g", &sprom->rssismf2g, 0);
-+	nvram_read_u8(fill, NULL, "bxa5g", &sprom->bxa5g, 0);
-+	nvram_read_u8(fill, NULL, "rssisav5g", &sprom->rssisav5g, 0);
-+	nvram_read_u8(fill, NULL, "rssismc5g", &sprom->rssismc5g, 0);
-+	nvram_read_u8(fill, NULL, "rssismf5g", &sprom->rssismf5g, 0);
-+	nvram_read_u8(fill, NULL, "tri2g", &sprom->tri2g, 0);
-+	nvram_read_u8(fill, NULL, "tri5g", &sprom->tri5g, 0);
-+	nvram_read_u8(fill, NULL, "tri5gl", &sprom->tri5gl, 0);
-+	nvram_read_u8(fill, NULL, "tri5gh", &sprom->tri5gh, 0);
-+	nvram_read_s8(fill, NULL, "rxpo2g", &sprom->rxpo2g, 0);
-+	nvram_read_s8(fill, NULL, "rxpo5g", &sprom->rxpo5g, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r3(struct ssb_sprom *sprom,
-+				  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "regrev", &sprom->regrev, 0);
-+	nvram_read_leddc(fill, "leddc", &sprom->leddc_on_time,
-+			 &sprom->leddc_off_time);
-+}
-+
-+static void bcm47xx_sprom_fill_r4589(struct ssb_sprom *sprom,
-+				     const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "regrev", &sprom->regrev, 0);
-+	nvram_read_s8(fill, NULL, "ag2", &sprom->antenna_gain.a2, 0);
-+	nvram_read_s8(fill, NULL, "ag3", &sprom->antenna_gain.a3, 0);
-+	nvram_read_u8(fill, NULL, "txchain", &sprom->txchain, 0xf);
-+	nvram_read_u8(fill, NULL, "rxchain", &sprom->rxchain, 0xf);
-+	nvram_read_u8(fill, NULL, "antswitch", &sprom->antswitch, 0xff);
-+	nvram_read_leddc(fill, "leddc", &sprom->leddc_on_time,
-+			 &sprom->leddc_off_time);
-+}
-+
-+static void bcm47xx_sprom_fill_r458(struct ssb_sprom *sprom,
-+				    const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "cck2gpo", &sprom->cck2gpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm2gpo", &sprom->ofdm2gpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm5gpo", &sprom->ofdm5gpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm5glpo", &sprom->ofdm5glpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm5ghpo", &sprom->ofdm5ghpo, 0);
-+	nvram_read_u16(fill, NULL, "cddpo", &sprom->cddpo, 0);
-+	nvram_read_u16(fill, NULL, "stbcpo", &sprom->stbcpo, 0);
-+	nvram_read_u16(fill, NULL, "bw40po", &sprom->bw40po, 0);
-+	nvram_read_u16(fill, NULL, "bwduppo", &sprom->bwduppo, 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo0", &sprom->mcs2gpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo1", &sprom->mcs2gpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo2", &sprom->mcs2gpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo3", &sprom->mcs2gpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo4", &sprom->mcs2gpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo5", &sprom->mcs2gpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo6", &sprom->mcs2gpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo7", &sprom->mcs2gpo[7], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo0", &sprom->mcs5gpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo1", &sprom->mcs5gpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo2", &sprom->mcs5gpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo3", &sprom->mcs5gpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo4", &sprom->mcs5gpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo5", &sprom->mcs5gpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo6", &sprom->mcs5gpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo7", &sprom->mcs5gpo[7], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo0", &sprom->mcs5glpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo1", &sprom->mcs5glpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo2", &sprom->mcs5glpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo3", &sprom->mcs5glpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo4", &sprom->mcs5glpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo5", &sprom->mcs5glpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo6", &sprom->mcs5glpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo7", &sprom->mcs5glpo[7], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo0", &sprom->mcs5ghpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo1", &sprom->mcs5ghpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo2", &sprom->mcs5ghpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo3", &sprom->mcs5ghpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo4", &sprom->mcs5ghpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo5", &sprom->mcs5ghpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo6", &sprom->mcs5ghpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo7", &sprom->mcs5ghpo[7], 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r45(struct ssb_sprom *sprom,
-+				   const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "txpid2ga0", &sprom->txpid2g[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid2ga1", &sprom->txpid2g[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid2ga2", &sprom->txpid2g[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid2ga3", &sprom->txpid2g[3], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga0", &sprom->txpid5g[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga1", &sprom->txpid5g[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga2", &sprom->txpid5g[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga3", &sprom->txpid5g[3], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla0", &sprom->txpid5gl[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla1", &sprom->txpid5gl[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla2", &sprom->txpid5gl[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla3", &sprom->txpid5gl[3], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha0", &sprom->txpid5gh[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha1", &sprom->txpid5gh[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha2", &sprom->txpid5gh[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha3", &sprom->txpid5gh[3], 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r89(struct ssb_sprom *sprom,
-+				   const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "tssipos2g", &sprom->fem.ghz2.tssipos, 0);
-+	nvram_read_u8(fill, NULL, "extpagain2g", &sprom->fem.ghz2.extpa_gain, 0);
-+	nvram_read_u8(fill, NULL, "pdetrange2g", &sprom->fem.ghz2.pdet_range, 0);
-+	nvram_read_u8(fill, NULL, "triso2g", &sprom->fem.ghz2.tr_iso, 0);
-+	nvram_read_u8(fill, NULL, "antswctl2g", &sprom->fem.ghz2.antswlut, 0);
-+	nvram_read_u8(fill, NULL, "tssipos5g", &sprom->fem.ghz5.tssipos, 0);
-+	nvram_read_u8(fill, NULL, "extpagain5g", &sprom->fem.ghz5.extpa_gain, 0);
-+	nvram_read_u8(fill, NULL, "pdetrange5g", &sprom->fem.ghz5.pdet_range, 0);
-+	nvram_read_u8(fill, NULL, "triso5g", &sprom->fem.ghz5.tr_iso, 0);
-+	nvram_read_u8(fill, NULL, "antswctl5g", &sprom->fem.ghz5.antswlut, 0);
-+	nvram_read_u8(fill, NULL, "tempthresh", &sprom->tempthresh, 0);
-+	nvram_read_u8(fill, NULL, "tempoffset", &sprom->tempoffset, 0);
-+	nvram_read_u16(fill, NULL, "rawtempsense", &sprom->rawtempsense, 0);
-+	nvram_read_u8(fill, NULL, "measpower", &sprom->measpower, 0);
-+	nvram_read_u8(fill, NULL, "tempsense_slope", &sprom->tempsense_slope, 0);
-+	nvram_read_u8(fill, NULL, "tempcorrx", &sprom->tempcorrx, 0);
-+	nvram_read_u8(fill, NULL, "tempsense_option", &sprom->tempsense_option, 0);
-+	nvram_read_u8(fill, NULL, "freqoffset_corr", &sprom->freqoffset_corr, 0);
-+	nvram_read_u8(fill, NULL, "iqcal_swp_dis", &sprom->iqcal_swp_dis, 0);
-+	nvram_read_u8(fill, NULL, "hw_iqcal_en", &sprom->hw_iqcal_en, 0);
-+	nvram_read_u8(fill, NULL, "elna2g", &sprom->elna2g, 0);
-+	nvram_read_u8(fill, NULL, "elna5g", &sprom->elna5g, 0);
-+	nvram_read_u8(fill, NULL, "phycal_tempdelta", &sprom->phycal_tempdelta, 0);
-+	nvram_read_u8(fill, NULL, "temps_period", &sprom->temps_period, 0);
-+	nvram_read_u8(fill, NULL, "temps_hysteresis", &sprom->temps_hysteresis, 0);
-+	nvram_read_u8(fill, NULL, "measpower1", &sprom->measpower1, 0);
-+	nvram_read_u8(fill, NULL, "measpower2", &sprom->measpower2, 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr2ga0", &sprom->rxgainerr2ga[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr2ga1", &sprom->rxgainerr2ga[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr2ga2", &sprom->rxgainerr2ga[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gla0", &sprom->rxgainerr5gla[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gla1", &sprom->rxgainerr5gla[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gla2", &sprom->rxgainerr5gla[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gma0", &sprom->rxgainerr5gma[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gma1", &sprom->rxgainerr5gma[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gma2", &sprom->rxgainerr5gma[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gha0", &sprom->rxgainerr5gha[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gha1", &sprom->rxgainerr5gha[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gha2", &sprom->rxgainerr5gha[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gua0", &sprom->rxgainerr5gua[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gua1", &sprom->rxgainerr5gua[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gua2", &sprom->rxgainerr5gua[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl2ga0", &sprom->noiselvl2ga[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl2ga1", &sprom->noiselvl2ga[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl2ga2", &sprom->noiselvl2ga[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gla0", &sprom->noiselvl5gla[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gla1", &sprom->noiselvl5gla[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gla2", &sprom->noiselvl5gla[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gma0", &sprom->noiselvl5gma[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gma1", &sprom->noiselvl5gma[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gma2", &sprom->noiselvl5gma[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gha0", &sprom->noiselvl5gha[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gha1", &sprom->noiselvl5gha[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gha2", &sprom->noiselvl5gha[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gua0", &sprom->noiselvl5gua[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gua1", &sprom->noiselvl5gua[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gua2", &sprom->noiselvl5gua[2], 0);
-+	nvram_read_u8(fill, NULL, "pcieingress_war", &sprom->pcieingress_war, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r9(struct ssb_sprom *sprom,
-+				  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "cckbw202gpo", &sprom->cckbw202gpo, 0);
-+	nvram_read_u16(fill, NULL, "cckbw20ul2gpo", &sprom->cckbw20ul2gpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw202gpo", &sprom->legofdmbw202gpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul2gpo", &sprom->legofdmbw20ul2gpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw205glpo", &sprom->legofdmbw205glpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul5glpo", &sprom->legofdmbw20ul5glpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw205gmpo", &sprom->legofdmbw205gmpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul5gmpo", &sprom->legofdmbw20ul5gmpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw205ghpo", &sprom->legofdmbw205ghpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul5ghpo", &sprom->legofdmbw20ul5ghpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw202gpo", &sprom->mcsbw202gpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul2gpo", &sprom->mcsbw20ul2gpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw402gpo", &sprom->mcsbw402gpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw205glpo", &sprom->mcsbw205glpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul5glpo", &sprom->mcsbw20ul5glpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw405glpo", &sprom->mcsbw405glpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw205gmpo", &sprom->mcsbw205gmpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul5gmpo", &sprom->mcsbw20ul5gmpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw405gmpo", &sprom->mcsbw405gmpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw205ghpo", &sprom->mcsbw205ghpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul5ghpo", &sprom->mcsbw20ul5ghpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw405ghpo", &sprom->mcsbw405ghpo, 0);
-+	nvram_read_u16(fill, NULL, "mcs32po", &sprom->mcs32po, 0);
-+	nvram_read_u16(fill, NULL, "legofdm40duppo", &sprom->legofdm40duppo, 0);
-+	nvram_read_u8(fill, NULL, "sar2g", &sprom->sar2g, 0);
-+	nvram_read_u8(fill, NULL, "sar5g", &sprom->sar5g, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_path_r4589(struct ssb_sprom *sprom,
-+					  const struct bcm47xx_sprom_fill *fill)
-+{
-+	char postfix[2];
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
-+		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
-+
-+		snprintf(postfix, sizeof(postfix), "%i", i);
-+		nvram_read_u8(fill, postfix, "maxp2ga", &pwr_info->maxpwr_2g, 0);
-+		nvram_read_u8(fill, postfix, "itt2ga", &pwr_info->itssi_2g, 0);
-+		nvram_read_u8(fill, postfix, "itt5ga", &pwr_info->itssi_5g, 0);
-+		nvram_read_u16(fill, postfix, "pa2gw0a", &pwr_info->pa_2g[0], 0);
-+		nvram_read_u16(fill, postfix, "pa2gw1a", &pwr_info->pa_2g[1], 0);
-+		nvram_read_u16(fill, postfix, "pa2gw2a", &pwr_info->pa_2g[2], 0);
-+		nvram_read_u8(fill, postfix, "maxp5ga", &pwr_info->maxpwr_5g, 0);
-+		nvram_read_u8(fill, postfix, "maxp5gha", &pwr_info->maxpwr_5gh, 0);
-+		nvram_read_u8(fill, postfix, "maxp5gla", &pwr_info->maxpwr_5gl, 0);
-+		nvram_read_u16(fill, postfix, "pa5gw0a", &pwr_info->pa_5g[0], 0);
-+		nvram_read_u16(fill, postfix, "pa5gw1a", &pwr_info->pa_5g[1], 0);
-+		nvram_read_u16(fill, postfix, "pa5gw2a", &pwr_info->pa_5g[2], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw0a", &pwr_info->pa_5gl[0], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw1a", &pwr_info->pa_5gl[1], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw2a", &pwr_info->pa_5gl[2], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw0a", &pwr_info->pa_5gh[0], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw1a", &pwr_info->pa_5gh[1], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw2a", &pwr_info->pa_5gh[2], 0);
-+	}
-+}
-+
-+static void bcm47xx_sprom_fill_path_r45(struct ssb_sprom *sprom,
-+					const struct bcm47xx_sprom_fill *fill)
-+{
-+	char postfix[2];
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
-+		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
-+
-+		snprintf(postfix, sizeof(postfix), "%i", i);
-+		nvram_read_u16(fill, postfix, "pa2gw3a", &pwr_info->pa_2g[3], 0);
-+		nvram_read_u16(fill, postfix, "pa5gw3a", &pwr_info->pa_5g[3], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw3a", &pwr_info->pa_5gl[3], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw3a", &pwr_info->pa_5gh[3], 0);
-+	}
-+}
-+
-+static bool bcm47xx_is_valid_mac(u8 *mac)
-+{
-+	return mac && !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c);
-+}
-+
-+static int bcm47xx_increase_mac_addr(u8 *mac, u8 num)
-+{
-+	u8 *oui = mac + ETH_ALEN/2 - 1;
-+	u8 *p = mac + ETH_ALEN - 1;
-+
-+	do {
-+		(*p) += num;
-+		if (*p > num)
-+			break;
-+		p--;
-+		num = 1;
-+	} while (p != oui);
-+
-+	if (p == oui) {
-+		pr_err("unable to fetch mac address\n");
-+		return -ENOENT;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * This is a global counter because different instances of sprom will
-+ * access the same nvram.
-+ */
-+static int mac_addr_used = 2;
-+
-+static void bcm47xx_sprom_fill_ethernet(struct ssb_sprom *sprom,
-+					const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_macaddr(fill, "et0macaddr", sprom->et0mac);
-+	nvram_read_u8(fill, NULL, "et0mdcport", &sprom->et0mdcport, 0);
-+	nvram_read_u8(fill, NULL, "et0phyaddr", &sprom->et0phyaddr, 0);
-+
-+	nvram_read_macaddr(fill, "et1macaddr", sprom->et1mac);
-+	nvram_read_u8(fill, NULL, "et1mdcport", &sprom->et1mdcport, 0);
-+	nvram_read_u8(fill, NULL, "et1phyaddr", &sprom->et1phyaddr, 0);
-+
-+	nvram_read_macaddr(fill, "macaddr", sprom->il0mac);
-+	nvram_read_macaddr(fill, "il0macaddr", sprom->il0mac);
-+
-+	/*
-+	 * The address prefix 00:90:4C is used by Broadcom in their initial
-+	 * configuration. When a mac address with the prefix 00:90:4C is used
-+	 * all devices from the same series are sharing the same mac address.
-+	 * To prevent mac address collisions we replace them with a mac address
-+	 * based on the base address.
-+	 */
-+	if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
-+		u8 mac[6];
-+		struct bcm47xx_sprom_fill fill_no_prefix;
-+
-+		memcpy(&fill_no_prefix, fill, sizeof(fill_no_prefix));
-+		fill_no_prefix.prefix = NULL;
-+
-+		nvram_read_macaddr(&fill_no_prefix, "et0macaddr", mac);
-+		if (bcm47xx_is_valid_mac(mac)) {
-+			int err = bcm47xx_increase_mac_addr(mac, mac_addr_used);
-+
-+			if (!err) {
-+				ether_addr_copy(sprom->il0mac, mac);
-+				mac_addr_used++;
-+			}
-+		}
-+	}
-+}
-+
-+static void bcm47xx_sprom_fill_board_data(struct ssb_sprom *sprom,
-+					  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "boardrev", &sprom->board_rev, 0);
-+	nvram_read_u16(fill, NULL, "boardnum", &sprom->board_num, 0);
-+	nvram_read_u16(fill, NULL, "boardtype", &sprom->board_type, 0);
-+	nvram_read_u32_2(fill, "boardflags", &sprom->boardflags_lo,
-+			 &sprom->boardflags_hi);
-+	nvram_read_u32_2(fill, "boardflags2", &sprom->boardflags2_lo,
-+			 &sprom->boardflags2_hi);
-+}
-+
-+static void bcm47xx_sprom_fill(struct ssb_sprom *sprom,
-+			       const struct bcm47xx_sprom_fill *fill)
-+{
-+	bcm47xx_sprom_fill_ethernet(sprom, fill);
-+	bcm47xx_sprom_fill_board_data(sprom, fill);
-+
-+	nvram_read_u8(fill, NULL, "sromrev", &sprom->revision, 0);
-+
-+	switch (sprom->revision) {
-+	case 1:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r1(sprom, fill);
-+		break;
-+	case 2:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		break;
-+	case 3:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		bcm47xx_sprom_fill_r389(sprom, fill);
-+		bcm47xx_sprom_fill_r3(sprom, fill);
-+		break;
-+	case 4:
-+	case 5:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_r458(sprom, fill);
-+		bcm47xx_sprom_fill_r45(sprom, fill);
-+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_path_r45(sprom, fill);
-+		break;
-+	case 8:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		bcm47xx_sprom_fill_r389(sprom, fill);
-+		bcm47xx_sprom_fill_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_r458(sprom, fill);
-+		bcm47xx_sprom_fill_r89(sprom, fill);
-+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
-+		break;
-+	case 9:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		bcm47xx_sprom_fill_r389(sprom, fill);
-+		bcm47xx_sprom_fill_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_r89(sprom, fill);
-+		bcm47xx_sprom_fill_r9(sprom, fill);
-+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
-+		break;
-+	default:
-+		pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
-+			sprom->revision);
-+		sprom->revision = 1;
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r1(sprom, fill);
-+	}
-+}
-+
-+static int bcm47xx_sprom_getenv(const struct bcm47xx_sprom_fill *fill,
-+				const char *name, char *val, size_t val_len)
-+{
-+	const struct platform_device *nvram_dev = fill->priv;
-+
-+	return bcm47xx_nvram_getenv(&nvram_dev->dev, name, val, val_len);
-+};
-+
-+static int bcm47xx_sprom_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct ssb_sprom *sprom;
-+	const __be32 *handle;
-+	struct device_node *nvram_node;
-+	struct platform_device *nvram_dev;
-+	struct bcm47xx_sprom_fill fill;
-+
-+	/* Alloc */
-+	sprom = devm_kzalloc(dev, sizeof(*sprom), GFP_KERNEL);
-+	if (!sprom)
-+		return -ENOMEM;
-+
-+	handle = of_get_property(np, "nvram", NULL);
-+	if (!handle)
-+		return -ENOMEM;
-+
-+	nvram_node = of_find_node_by_phandle(be32_to_cpup(handle));
-+	if (!nvram_node)
-+		return -ENOMEM;
-+
-+	nvram_dev = of_find_device_by_node(nvram_node);
-+	if (!nvram_dev)
-+		return -ENOMEM;
-+
-+	fill.prefix = of_get_property(np, "prefix", NULL);
-+
-+	fill.fallback = false;
-+	fill.getenv = bcm47xx_sprom_getenv;
-+	fill.priv = nvram_dev;
-+
-+	bcm47xx_sprom_fill(sprom, &fill);
-+
-+	platform_set_drvdata(pdev, sprom);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id bcm47xx_sprom_of_match_table[] = {
-+	{ .compatible = "brcm,bcm47xx-sprom", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
-+
-+static struct platform_driver bcm47xx_sprom_driver = {
-+	.driver = {
-+		.owner = THIS_MODULE,
-+		.name = "bcm47xx-sprom",
-+		.of_match_table = bcm47xx_sprom_of_match_table,
-+		/* driver unloading/unbinding currently not supported */
-+		.suppress_bind_attrs = true,
-+	},
-+	.probe = bcm47xx_sprom_probe,
-+};
-+module_platform_driver(bcm47xx_sprom_driver);
-+
-+MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm53xx/patches-3.18/112-bcm53xx-sprom-add-sprom-driver.patch b/target/linux/bcm53xx/patches-3.18/112-bcm53xx-sprom-add-sprom-driver.patch
index c3d5b4d7bc..8ad6ca4682 100644
--- a/target/linux/bcm53xx/patches-3.18/112-bcm53xx-sprom-add-sprom-driver.patch
+++ b/target/linux/bcm53xx/patches-3.18/112-bcm53xx-sprom-add-sprom-driver.patch
@@ -67,696 +67,3 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  obj-$(CONFIG_CXL_BASE)		+= cxl/
  obj-$(CONFIG_BCM47XX_NVRAM)	+= bcm47xx-nvram.o
 +obj-$(CONFIG_BCM47XX_SPROM)	+= bcm47xx-sprom.o
---- /dev/null
-+++ b/drivers/misc/bcm47xx-sprom.c
-@@ -0,0 +1,690 @@
-+/*
-+ * BCM47xx/BCM53xx nvram variable access
-+ *
-+ * Copyright (C) 2005 Broadcom Corporation
-+ * Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
-+ * Copyright (C) 2006 Michael Buesch <m@bues.ch>
-+ * Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-+ * Copyright (C) 2010-2014 Hauke Mehrtens <hauke@hauke-m.de>
-+ *
-+ * This program is free software; you can redistribute	it and/or modify it
-+ * under  the terms of	the GNU General	 Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/of_address.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/of_platform.h>
-+#include <linux/io.h>
-+#include <linux/ssb/ssb.h>
-+#include <linux/bcm47xx_nvram.h>
-+#include <linux/if_ether.h>
-+#include <linux/etherdevice.h>
-+
-+struct bcm47xx_sprom_fill {
-+	const char *prefix;
-+	bool fallback;
-+	int (*getenv)(const struct bcm47xx_sprom_fill *fill, const char *name,
-+		      char *val, size_t val_len);
-+	const void *priv;
-+};
-+
-+static void create_key(const char *prefix, const char *postfix,
-+		       const char *name, char *buf, int len)
-+{
-+	if (prefix && postfix)
-+		snprintf(buf, len, "%s%s%s", prefix, name, postfix);
-+	else if (prefix)
-+		snprintf(buf, len, "%s%s", prefix, name);
-+	else if (postfix)
-+		snprintf(buf, len, "%s%s", name, postfix);
-+	else
-+		snprintf(buf, len, "%s", name);
-+}
-+
-+static int get_nvram_var(const struct bcm47xx_sprom_fill *fill,
-+			 const char *postfix, const char *name, char *buf,
-+			 int len)
-+{
-+	char key[40];
-+	int err;
-+
-+	create_key(fill->prefix, postfix, name, key, sizeof(key));
-+
-+	err = fill->getenv(fill, key, buf, len);
-+	if (fill->fallback && err == -ENOENT && fill->prefix) {
-+		create_key(NULL, postfix, name, key, sizeof(key));
-+		err = fill->getenv(fill, key, buf, len);
-+	}
-+	return err;
-+}
-+
-+#define NVRAM_READ_VAL(type)						\
-+static void nvram_read_ ## type (const struct bcm47xx_sprom_fill *fill,	\
-+				 const char *postfix, const char *name, \
-+				 type *val, type allset)		\
-+{									\
-+	char buf[100];							\
-+	int err;							\
-+	type var;							\
-+									\
-+	err = get_nvram_var(fill, postfix, name, buf, sizeof(buf));	\
-+	if (err < 0)							\
-+		return;							\
-+	err = kstrto ## type(strim(buf), 0, &var);			\
-+	if (err) {							\
-+		pr_warn("can not parse nvram name %s%s%s with value %s got %i\n",	\
-+			fill->prefix, name, postfix, buf, err);		\
-+		return;							\
-+	}								\
-+	if (allset && var == allset)					\
-+		return;							\
-+	*val = var;							\
-+}
-+
-+NVRAM_READ_VAL(u8)
-+NVRAM_READ_VAL(s8)
-+NVRAM_READ_VAL(u16)
-+NVRAM_READ_VAL(u32)
-+
-+#undef NVRAM_READ_VAL
-+
-+static void nvram_read_u32_2(const struct bcm47xx_sprom_fill *fill,
-+			     const char *name, u16 *val_lo, u16 *val_hi)
-+{
-+	char buf[100];
-+	int err;
-+	u32 val;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+	err = kstrtou32(strim(buf), 0, &val);
-+	if (err) {
-+		pr_warn("can not parse nvram name %s%s with value %s got %i\n",
-+			fill->prefix, name, buf, err);
-+		return;
-+	}
-+	*val_lo = (val & 0x0000FFFFU);
-+	*val_hi = (val & 0xFFFF0000U) >> 16;
-+}
-+
-+static void nvram_read_leddc(const struct bcm47xx_sprom_fill *fill,
-+			     const char *name, u8 *leddc_on_time,
-+			     u8 *leddc_off_time)
-+{
-+	char buf[100];
-+	int err;
-+	u32 val;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+	err = kstrtou32(strim(buf), 0, &val);
-+	if (err) {
-+		pr_warn("can not parse nvram name %s%s with value %s got %i\n",
-+			fill->prefix, name, buf, err);
-+		return;
-+	}
-+
-+	if (val == 0xffff || val == 0xffffffff)
-+		return;
-+
-+	*leddc_on_time = val & 0xff;
-+	*leddc_off_time = (val >> 16) & 0xff;
-+}
-+
-+static void nvram_read_macaddr(const struct bcm47xx_sprom_fill *fill,
-+			       const char *name, u8 val[6])
-+{
-+	char buf[100];
-+	int err;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+
-+	bcm47xx_nvram_parse_macaddr(buf, val);
-+}
-+
-+static void nvram_read_alpha2(const struct bcm47xx_sprom_fill *fill,
-+			      const char *name, char val[2])
-+{
-+	char buf[10];
-+	int err;
-+
-+	err = get_nvram_var(fill, NULL, name, buf, sizeof(buf));
-+	if (err < 0)
-+		return;
-+	if (buf[0] == '0')
-+		return;
-+	if (strlen(buf) > 2) {
-+		pr_warn("alpha2 is too long %s\n", buf);
-+		return;
-+	}
-+	memcpy(val, buf, 2);
-+}
-+
-+static void bcm47xx_sprom_fill_r1234589(struct ssb_sprom *sprom,
-+					const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "devid", &sprom->dev_id, 0);
-+	nvram_read_u8(fill, NULL, "ledbh0", &sprom->gpio0, 0xff);
-+	nvram_read_u8(fill, NULL, "ledbh1", &sprom->gpio1, 0xff);
-+	nvram_read_u8(fill, NULL, "ledbh2", &sprom->gpio2, 0xff);
-+	nvram_read_u8(fill, NULL, "ledbh3", &sprom->gpio3, 0xff);
-+	nvram_read_u8(fill, NULL, "aa2g", &sprom->ant_available_bg, 0);
-+	nvram_read_u8(fill, NULL, "aa5g", &sprom->ant_available_a, 0);
-+	nvram_read_s8(fill, NULL, "ag0", &sprom->antenna_gain.a0, 0);
-+	nvram_read_s8(fill, NULL, "ag1", &sprom->antenna_gain.a1, 0);
-+	nvram_read_alpha2(fill, "ccode", sprom->alpha2);
-+}
-+
-+static void bcm47xx_sprom_fill_r12389(struct ssb_sprom *sprom,
-+				      const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "pa0b0", &sprom->pa0b0, 0);
-+	nvram_read_u16(fill, NULL, "pa0b1", &sprom->pa0b1, 0);
-+	nvram_read_u16(fill, NULL, "pa0b2", &sprom->pa0b2, 0);
-+	nvram_read_u8(fill, NULL, "pa0itssit", &sprom->itssi_bg, 0);
-+	nvram_read_u8(fill, NULL, "pa0maxpwr", &sprom->maxpwr_bg, 0);
-+	nvram_read_u16(fill, NULL, "pa1b0", &sprom->pa1b0, 0);
-+	nvram_read_u16(fill, NULL, "pa1b1", &sprom->pa1b1, 0);
-+	nvram_read_u16(fill, NULL, "pa1b2", &sprom->pa1b2, 0);
-+	nvram_read_u8(fill, NULL, "pa1itssit", &sprom->itssi_a, 0);
-+	nvram_read_u8(fill, NULL, "pa1maxpwr", &sprom->maxpwr_a, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r1(struct ssb_sprom *sprom,
-+				  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "boardflags", &sprom->boardflags_lo, 0);
-+	nvram_read_u8(fill, NULL, "cc", &sprom->country_code, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r2389(struct ssb_sprom *sprom,
-+				     const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "opo", &sprom->opo, 0);
-+	nvram_read_u16(fill, NULL, "pa1lob0", &sprom->pa1lob0, 0);
-+	nvram_read_u16(fill, NULL, "pa1lob1", &sprom->pa1lob1, 0);
-+	nvram_read_u16(fill, NULL, "pa1lob2", &sprom->pa1lob2, 0);
-+	nvram_read_u16(fill, NULL, "pa1hib0", &sprom->pa1hib0, 0);
-+	nvram_read_u16(fill, NULL, "pa1hib1", &sprom->pa1hib1, 0);
-+	nvram_read_u16(fill, NULL, "pa1hib2", &sprom->pa1hib2, 0);
-+	nvram_read_u8(fill, NULL, "pa1lomaxpwr", &sprom->maxpwr_al, 0);
-+	nvram_read_u8(fill, NULL, "pa1himaxpwr", &sprom->maxpwr_ah, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r389(struct ssb_sprom *sprom,
-+				    const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "bxa2g", &sprom->bxa2g, 0);
-+	nvram_read_u8(fill, NULL, "rssisav2g", &sprom->rssisav2g, 0);
-+	nvram_read_u8(fill, NULL, "rssismc2g", &sprom->rssismc2g, 0);
-+	nvram_read_u8(fill, NULL, "rssismf2g", &sprom->rssismf2g, 0);
-+	nvram_read_u8(fill, NULL, "bxa5g", &sprom->bxa5g, 0);
-+	nvram_read_u8(fill, NULL, "rssisav5g", &sprom->rssisav5g, 0);
-+	nvram_read_u8(fill, NULL, "rssismc5g", &sprom->rssismc5g, 0);
-+	nvram_read_u8(fill, NULL, "rssismf5g", &sprom->rssismf5g, 0);
-+	nvram_read_u8(fill, NULL, "tri2g", &sprom->tri2g, 0);
-+	nvram_read_u8(fill, NULL, "tri5g", &sprom->tri5g, 0);
-+	nvram_read_u8(fill, NULL, "tri5gl", &sprom->tri5gl, 0);
-+	nvram_read_u8(fill, NULL, "tri5gh", &sprom->tri5gh, 0);
-+	nvram_read_s8(fill, NULL, "rxpo2g", &sprom->rxpo2g, 0);
-+	nvram_read_s8(fill, NULL, "rxpo5g", &sprom->rxpo5g, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r3(struct ssb_sprom *sprom,
-+				  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "regrev", &sprom->regrev, 0);
-+	nvram_read_leddc(fill, "leddc", &sprom->leddc_on_time,
-+			 &sprom->leddc_off_time);
-+}
-+
-+static void bcm47xx_sprom_fill_r4589(struct ssb_sprom *sprom,
-+				     const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "regrev", &sprom->regrev, 0);
-+	nvram_read_s8(fill, NULL, "ag2", &sprom->antenna_gain.a2, 0);
-+	nvram_read_s8(fill, NULL, "ag3", &sprom->antenna_gain.a3, 0);
-+	nvram_read_u8(fill, NULL, "txchain", &sprom->txchain, 0xf);
-+	nvram_read_u8(fill, NULL, "rxchain", &sprom->rxchain, 0xf);
-+	nvram_read_u8(fill, NULL, "antswitch", &sprom->antswitch, 0xff);
-+	nvram_read_leddc(fill, "leddc", &sprom->leddc_on_time,
-+			 &sprom->leddc_off_time);
-+}
-+
-+static void bcm47xx_sprom_fill_r458(struct ssb_sprom *sprom,
-+				    const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "cck2gpo", &sprom->cck2gpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm2gpo", &sprom->ofdm2gpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm5gpo", &sprom->ofdm5gpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm5glpo", &sprom->ofdm5glpo, 0);
-+	nvram_read_u32(fill, NULL, "ofdm5ghpo", &sprom->ofdm5ghpo, 0);
-+	nvram_read_u16(fill, NULL, "cddpo", &sprom->cddpo, 0);
-+	nvram_read_u16(fill, NULL, "stbcpo", &sprom->stbcpo, 0);
-+	nvram_read_u16(fill, NULL, "bw40po", &sprom->bw40po, 0);
-+	nvram_read_u16(fill, NULL, "bwduppo", &sprom->bwduppo, 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo0", &sprom->mcs2gpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo1", &sprom->mcs2gpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo2", &sprom->mcs2gpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo3", &sprom->mcs2gpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo4", &sprom->mcs2gpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo5", &sprom->mcs2gpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo6", &sprom->mcs2gpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs2gpo7", &sprom->mcs2gpo[7], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo0", &sprom->mcs5gpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo1", &sprom->mcs5gpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo2", &sprom->mcs5gpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo3", &sprom->mcs5gpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo4", &sprom->mcs5gpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo5", &sprom->mcs5gpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo6", &sprom->mcs5gpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs5gpo7", &sprom->mcs5gpo[7], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo0", &sprom->mcs5glpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo1", &sprom->mcs5glpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo2", &sprom->mcs5glpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo3", &sprom->mcs5glpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo4", &sprom->mcs5glpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo5", &sprom->mcs5glpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo6", &sprom->mcs5glpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs5glpo7", &sprom->mcs5glpo[7], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo0", &sprom->mcs5ghpo[0], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo1", &sprom->mcs5ghpo[1], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo2", &sprom->mcs5ghpo[2], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo3", &sprom->mcs5ghpo[3], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo4", &sprom->mcs5ghpo[4], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo5", &sprom->mcs5ghpo[5], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo6", &sprom->mcs5ghpo[6], 0);
-+	nvram_read_u16(fill, NULL, "mcs5ghpo7", &sprom->mcs5ghpo[7], 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r45(struct ssb_sprom *sprom,
-+				   const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "txpid2ga0", &sprom->txpid2g[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid2ga1", &sprom->txpid2g[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid2ga2", &sprom->txpid2g[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid2ga3", &sprom->txpid2g[3], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga0", &sprom->txpid5g[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga1", &sprom->txpid5g[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga2", &sprom->txpid5g[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid5ga3", &sprom->txpid5g[3], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla0", &sprom->txpid5gl[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla1", &sprom->txpid5gl[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla2", &sprom->txpid5gl[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gla3", &sprom->txpid5gl[3], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha0", &sprom->txpid5gh[0], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha1", &sprom->txpid5gh[1], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha2", &sprom->txpid5gh[2], 0);
-+	nvram_read_u8(fill, NULL, "txpid5gha3", &sprom->txpid5gh[3], 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r89(struct ssb_sprom *sprom,
-+				   const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u8(fill, NULL, "tssipos2g", &sprom->fem.ghz2.tssipos, 0);
-+	nvram_read_u8(fill, NULL, "extpagain2g", &sprom->fem.ghz2.extpa_gain, 0);
-+	nvram_read_u8(fill, NULL, "pdetrange2g", &sprom->fem.ghz2.pdet_range, 0);
-+	nvram_read_u8(fill, NULL, "triso2g", &sprom->fem.ghz2.tr_iso, 0);
-+	nvram_read_u8(fill, NULL, "antswctl2g", &sprom->fem.ghz2.antswlut, 0);
-+	nvram_read_u8(fill, NULL, "tssipos5g", &sprom->fem.ghz5.tssipos, 0);
-+	nvram_read_u8(fill, NULL, "extpagain5g", &sprom->fem.ghz5.extpa_gain, 0);
-+	nvram_read_u8(fill, NULL, "pdetrange5g", &sprom->fem.ghz5.pdet_range, 0);
-+	nvram_read_u8(fill, NULL, "triso5g", &sprom->fem.ghz5.tr_iso, 0);
-+	nvram_read_u8(fill, NULL, "antswctl5g", &sprom->fem.ghz5.antswlut, 0);
-+	nvram_read_u8(fill, NULL, "tempthresh", &sprom->tempthresh, 0);
-+	nvram_read_u8(fill, NULL, "tempoffset", &sprom->tempoffset, 0);
-+	nvram_read_u16(fill, NULL, "rawtempsense", &sprom->rawtempsense, 0);
-+	nvram_read_u8(fill, NULL, "measpower", &sprom->measpower, 0);
-+	nvram_read_u8(fill, NULL, "tempsense_slope", &sprom->tempsense_slope, 0);
-+	nvram_read_u8(fill, NULL, "tempcorrx", &sprom->tempcorrx, 0);
-+	nvram_read_u8(fill, NULL, "tempsense_option", &sprom->tempsense_option, 0);
-+	nvram_read_u8(fill, NULL, "freqoffset_corr", &sprom->freqoffset_corr, 0);
-+	nvram_read_u8(fill, NULL, "iqcal_swp_dis", &sprom->iqcal_swp_dis, 0);
-+	nvram_read_u8(fill, NULL, "hw_iqcal_en", &sprom->hw_iqcal_en, 0);
-+	nvram_read_u8(fill, NULL, "elna2g", &sprom->elna2g, 0);
-+	nvram_read_u8(fill, NULL, "elna5g", &sprom->elna5g, 0);
-+	nvram_read_u8(fill, NULL, "phycal_tempdelta", &sprom->phycal_tempdelta, 0);
-+	nvram_read_u8(fill, NULL, "temps_period", &sprom->temps_period, 0);
-+	nvram_read_u8(fill, NULL, "temps_hysteresis", &sprom->temps_hysteresis, 0);
-+	nvram_read_u8(fill, NULL, "measpower1", &sprom->measpower1, 0);
-+	nvram_read_u8(fill, NULL, "measpower2", &sprom->measpower2, 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr2ga0", &sprom->rxgainerr2ga[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr2ga1", &sprom->rxgainerr2ga[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr2ga2", &sprom->rxgainerr2ga[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gla0", &sprom->rxgainerr5gla[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gla1", &sprom->rxgainerr5gla[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gla2", &sprom->rxgainerr5gla[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gma0", &sprom->rxgainerr5gma[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gma1", &sprom->rxgainerr5gma[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gma2", &sprom->rxgainerr5gma[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gha0", &sprom->rxgainerr5gha[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gha1", &sprom->rxgainerr5gha[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gha2", &sprom->rxgainerr5gha[2], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gua0", &sprom->rxgainerr5gua[0], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gua1", &sprom->rxgainerr5gua[1], 0);
-+	nvram_read_u8(fill, NULL, "rxgainerr5gua2", &sprom->rxgainerr5gua[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl2ga0", &sprom->noiselvl2ga[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl2ga1", &sprom->noiselvl2ga[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl2ga2", &sprom->noiselvl2ga[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gla0", &sprom->noiselvl5gla[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gla1", &sprom->noiselvl5gla[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gla2", &sprom->noiselvl5gla[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gma0", &sprom->noiselvl5gma[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gma1", &sprom->noiselvl5gma[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gma2", &sprom->noiselvl5gma[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gha0", &sprom->noiselvl5gha[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gha1", &sprom->noiselvl5gha[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gha2", &sprom->noiselvl5gha[2], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gua0", &sprom->noiselvl5gua[0], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gua1", &sprom->noiselvl5gua[1], 0);
-+	nvram_read_u8(fill, NULL, "noiselvl5gua2", &sprom->noiselvl5gua[2], 0);
-+	nvram_read_u8(fill, NULL, "pcieingress_war", &sprom->pcieingress_war, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_r9(struct ssb_sprom *sprom,
-+				  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "cckbw202gpo", &sprom->cckbw202gpo, 0);
-+	nvram_read_u16(fill, NULL, "cckbw20ul2gpo", &sprom->cckbw20ul2gpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw202gpo", &sprom->legofdmbw202gpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul2gpo", &sprom->legofdmbw20ul2gpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw205glpo", &sprom->legofdmbw205glpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul5glpo", &sprom->legofdmbw20ul5glpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw205gmpo", &sprom->legofdmbw205gmpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul5gmpo", &sprom->legofdmbw20ul5gmpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw205ghpo", &sprom->legofdmbw205ghpo, 0);
-+	nvram_read_u32(fill, NULL, "legofdmbw20ul5ghpo", &sprom->legofdmbw20ul5ghpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw202gpo", &sprom->mcsbw202gpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul2gpo", &sprom->mcsbw20ul2gpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw402gpo", &sprom->mcsbw402gpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw205glpo", &sprom->mcsbw205glpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul5glpo", &sprom->mcsbw20ul5glpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw405glpo", &sprom->mcsbw405glpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw205gmpo", &sprom->mcsbw205gmpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul5gmpo", &sprom->mcsbw20ul5gmpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw405gmpo", &sprom->mcsbw405gmpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw205ghpo", &sprom->mcsbw205ghpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw20ul5ghpo", &sprom->mcsbw20ul5ghpo, 0);
-+	nvram_read_u32(fill, NULL, "mcsbw405ghpo", &sprom->mcsbw405ghpo, 0);
-+	nvram_read_u16(fill, NULL, "mcs32po", &sprom->mcs32po, 0);
-+	nvram_read_u16(fill, NULL, "legofdm40duppo", &sprom->legofdm40duppo, 0);
-+	nvram_read_u8(fill, NULL, "sar2g", &sprom->sar2g, 0);
-+	nvram_read_u8(fill, NULL, "sar5g", &sprom->sar5g, 0);
-+}
-+
-+static void bcm47xx_sprom_fill_path_r4589(struct ssb_sprom *sprom,
-+					  const struct bcm47xx_sprom_fill *fill)
-+{
-+	char postfix[2];
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
-+		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
-+
-+		snprintf(postfix, sizeof(postfix), "%i", i);
-+		nvram_read_u8(fill, postfix, "maxp2ga", &pwr_info->maxpwr_2g, 0);
-+		nvram_read_u8(fill, postfix, "itt2ga", &pwr_info->itssi_2g, 0);
-+		nvram_read_u8(fill, postfix, "itt5ga", &pwr_info->itssi_5g, 0);
-+		nvram_read_u16(fill, postfix, "pa2gw0a", &pwr_info->pa_2g[0], 0);
-+		nvram_read_u16(fill, postfix, "pa2gw1a", &pwr_info->pa_2g[1], 0);
-+		nvram_read_u16(fill, postfix, "pa2gw2a", &pwr_info->pa_2g[2], 0);
-+		nvram_read_u8(fill, postfix, "maxp5ga", &pwr_info->maxpwr_5g, 0);
-+		nvram_read_u8(fill, postfix, "maxp5gha", &pwr_info->maxpwr_5gh, 0);
-+		nvram_read_u8(fill, postfix, "maxp5gla", &pwr_info->maxpwr_5gl, 0);
-+		nvram_read_u16(fill, postfix, "pa5gw0a", &pwr_info->pa_5g[0], 0);
-+		nvram_read_u16(fill, postfix, "pa5gw1a", &pwr_info->pa_5g[1], 0);
-+		nvram_read_u16(fill, postfix, "pa5gw2a", &pwr_info->pa_5g[2], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw0a", &pwr_info->pa_5gl[0], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw1a", &pwr_info->pa_5gl[1], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw2a", &pwr_info->pa_5gl[2], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw0a", &pwr_info->pa_5gh[0], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw1a", &pwr_info->pa_5gh[1], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw2a", &pwr_info->pa_5gh[2], 0);
-+	}
-+}
-+
-+static void bcm47xx_sprom_fill_path_r45(struct ssb_sprom *sprom,
-+					const struct bcm47xx_sprom_fill *fill)
-+{
-+	char postfix[2];
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
-+		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
-+
-+		snprintf(postfix, sizeof(postfix), "%i", i);
-+		nvram_read_u16(fill, postfix, "pa2gw3a", &pwr_info->pa_2g[3], 0);
-+		nvram_read_u16(fill, postfix, "pa5gw3a", &pwr_info->pa_5g[3], 0);
-+		nvram_read_u16(fill, postfix, "pa5glw3a", &pwr_info->pa_5gl[3], 0);
-+		nvram_read_u16(fill, postfix, "pa5ghw3a", &pwr_info->pa_5gh[3], 0);
-+	}
-+}
-+
-+static bool bcm47xx_is_valid_mac(u8 *mac)
-+{
-+	return mac && !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c);
-+}
-+
-+static int bcm47xx_increase_mac_addr(u8 *mac, u8 num)
-+{
-+	u8 *oui = mac + ETH_ALEN/2 - 1;
-+	u8 *p = mac + ETH_ALEN - 1;
-+
-+	do {
-+		(*p) += num;
-+		if (*p > num)
-+			break;
-+		p--;
-+		num = 1;
-+	} while (p != oui);
-+
-+	if (p == oui) {
-+		pr_err("unable to fetch mac address\n");
-+		return -ENOENT;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * This is a global counter because different instances of sprom will
-+ * access the same nvram.
-+ */
-+static int mac_addr_used = 2;
-+
-+static void bcm47xx_sprom_fill_ethernet(struct ssb_sprom *sprom,
-+					const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_macaddr(fill, "et0macaddr", sprom->et0mac);
-+	nvram_read_u8(fill, NULL, "et0mdcport", &sprom->et0mdcport, 0);
-+	nvram_read_u8(fill, NULL, "et0phyaddr", &sprom->et0phyaddr, 0);
-+
-+	nvram_read_macaddr(fill, "et1macaddr", sprom->et1mac);
-+	nvram_read_u8(fill, NULL, "et1mdcport", &sprom->et1mdcport, 0);
-+	nvram_read_u8(fill, NULL, "et1phyaddr", &sprom->et1phyaddr, 0);
-+
-+	nvram_read_macaddr(fill, "macaddr", sprom->il0mac);
-+	nvram_read_macaddr(fill, "il0macaddr", sprom->il0mac);
-+
-+	/*
-+	 * The address prefix 00:90:4C is used by Broadcom in their initial
-+	 * configuration. When a mac address with the prefix 00:90:4C is used
-+	 * all devices from the same series are sharing the same mac address.
-+	 * To prevent mac address collisions we replace them with a mac address
-+	 * based on the base address.
-+	 */
-+	if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
-+		u8 mac[6];
-+		struct bcm47xx_sprom_fill fill_no_prefix;
-+
-+		memcpy(&fill_no_prefix, fill, sizeof(fill_no_prefix));
-+		fill_no_prefix.prefix = NULL;
-+
-+		nvram_read_macaddr(&fill_no_prefix, "et0macaddr", mac);
-+		if (bcm47xx_is_valid_mac(mac)) {
-+			int err = bcm47xx_increase_mac_addr(mac, mac_addr_used);
-+
-+			if (!err) {
-+				ether_addr_copy(sprom->il0mac, mac);
-+				mac_addr_used++;
-+			}
-+		}
-+	}
-+}
-+
-+static void bcm47xx_sprom_fill_board_data(struct ssb_sprom *sprom,
-+					  const struct bcm47xx_sprom_fill *fill)
-+{
-+	nvram_read_u16(fill, NULL, "boardrev", &sprom->board_rev, 0);
-+	nvram_read_u16(fill, NULL, "boardnum", &sprom->board_num, 0);
-+	nvram_read_u16(fill, NULL, "boardtype", &sprom->board_type, 0);
-+	nvram_read_u32_2(fill, "boardflags", &sprom->boardflags_lo,
-+			 &sprom->boardflags_hi);
-+	nvram_read_u32_2(fill, "boardflags2", &sprom->boardflags2_lo,
-+			 &sprom->boardflags2_hi);
-+}
-+
-+static void bcm47xx_sprom_fill(struct ssb_sprom *sprom,
-+			       const struct bcm47xx_sprom_fill *fill)
-+{
-+	bcm47xx_sprom_fill_ethernet(sprom, fill);
-+	bcm47xx_sprom_fill_board_data(sprom, fill);
-+
-+	nvram_read_u8(fill, NULL, "sromrev", &sprom->revision, 0);
-+
-+	switch (sprom->revision) {
-+	case 1:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r1(sprom, fill);
-+		break;
-+	case 2:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		break;
-+	case 3:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		bcm47xx_sprom_fill_r389(sprom, fill);
-+		bcm47xx_sprom_fill_r3(sprom, fill);
-+		break;
-+	case 4:
-+	case 5:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_r458(sprom, fill);
-+		bcm47xx_sprom_fill_r45(sprom, fill);
-+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_path_r45(sprom, fill);
-+		break;
-+	case 8:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		bcm47xx_sprom_fill_r389(sprom, fill);
-+		bcm47xx_sprom_fill_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_r458(sprom, fill);
-+		bcm47xx_sprom_fill_r89(sprom, fill);
-+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
-+		break;
-+	case 9:
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r2389(sprom, fill);
-+		bcm47xx_sprom_fill_r389(sprom, fill);
-+		bcm47xx_sprom_fill_r4589(sprom, fill);
-+		bcm47xx_sprom_fill_r89(sprom, fill);
-+		bcm47xx_sprom_fill_r9(sprom, fill);
-+		bcm47xx_sprom_fill_path_r4589(sprom, fill);
-+		break;
-+	default:
-+		pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
-+			sprom->revision);
-+		sprom->revision = 1;
-+		bcm47xx_sprom_fill_r1234589(sprom, fill);
-+		bcm47xx_sprom_fill_r12389(sprom, fill);
-+		bcm47xx_sprom_fill_r1(sprom, fill);
-+	}
-+}
-+
-+static int bcm47xx_sprom_getenv(const struct bcm47xx_sprom_fill *fill,
-+				const char *name, char *val, size_t val_len)
-+{
-+	const struct platform_device *nvram_dev = fill->priv;
-+
-+	return bcm47xx_nvram_getenv(&nvram_dev->dev, name, val, val_len);
-+};
-+
-+static int bcm47xx_sprom_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct ssb_sprom *sprom;
-+	const __be32 *handle;
-+	struct device_node *nvram_node;
-+	struct platform_device *nvram_dev;
-+	struct bcm47xx_sprom_fill fill;
-+
-+	/* Alloc */
-+	sprom = devm_kzalloc(dev, sizeof(*sprom), GFP_KERNEL);
-+	if (!sprom)
-+		return -ENOMEM;
-+
-+	handle = of_get_property(np, "nvram", NULL);
-+	if (!handle)
-+		return -ENOMEM;
-+
-+	nvram_node = of_find_node_by_phandle(be32_to_cpup(handle));
-+	if (!nvram_node)
-+		return -ENOMEM;
-+
-+	nvram_dev = of_find_device_by_node(nvram_node);
-+	if (!nvram_dev)
-+		return -ENOMEM;
-+
-+	fill.prefix = of_get_property(np, "prefix", NULL);
-+
-+	fill.fallback = false;
-+	fill.getenv = bcm47xx_sprom_getenv;
-+	fill.priv = nvram_dev;
-+
-+	bcm47xx_sprom_fill(sprom, &fill);
-+
-+	platform_set_drvdata(pdev, sprom);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id bcm47xx_sprom_of_match_table[] = {
-+	{ .compatible = "brcm,bcm47xx-sprom", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
-+
-+static struct platform_driver bcm47xx_sprom_driver = {
-+	.driver = {
-+		.owner = THIS_MODULE,
-+		.name = "bcm47xx-sprom",
-+		.of_match_table = bcm47xx_sprom_of_match_table,
-+		/* driver unloading/unbinding currently not supported */
-+		.suppress_bind_attrs = true,
-+	},
-+	.probe = bcm47xx_sprom_probe,
-+};
-+module_platform_driver(bcm47xx_sprom_driver);
-+
-+MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>");
-+MODULE_LICENSE("GPL v2");