bcm53xx: use static NVRAM pointer for now

This will allow us to sync with code sent for upstream.

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

SVN-Revision: 43608

1 files changed, 3 insertions, 245 deletions

diff --git a/target/linux/bcm53xx/patches-3.14/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch b/target/linux/bcm53xx/patches-3.14/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
index 35cbc73..c4c7339 100644
--- a/target/linux/bcm53xx/patches-3.14/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
+++ b/target/linux/bcm53xx/patches-3.14/111-bcm47xx-nvram-add-new-nvram-driver-with-dt-support.patch
@@ -59,184 +59,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +	compatible = "brcm,bcm47xx-nvram";
 +	reg = <0x1c000000 0x01000000>;
 +};
---- a/arch/mips/bcm47xx/board.c
-+++ b/arch/mips/bcm47xx/board.c
-@@ -196,50 +196,50 @@ static __init const struct bcm47xx_board
- 	const struct bcm47xx_board_type_list2 *e2;
- 	const struct bcm47xx_board_type_list3 *e3;
- 
--	if (bcm47xx_nvram_getenv("model_name", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "model_name", buf1, sizeof(buf1)) >= 0) {
- 		for (e1 = bcm47xx_board_list_model_name; e1->value1; e1++) {
- 			if (!strcmp(buf1, e1->value1))
- 				return &e1->board;
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("model_no", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "model_no", buf1, sizeof(buf1)) >= 0) {
- 		for (e1 = bcm47xx_board_list_model_no; e1->value1; e1++) {
- 			if (strstarts(buf1, e1->value1))
- 				return &e1->board;
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("machine_name", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "machine_name", buf1, sizeof(buf1)) >= 0) {
- 		for (e1 = bcm47xx_board_list_machine_name; e1->value1; e1++) {
- 			if (strstarts(buf1, e1->value1))
- 				return &e1->board;
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "hardware_version", buf1, sizeof(buf1)) >= 0) {
- 		for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) {
- 			if (strstarts(buf1, e1->value1))
- 				return &e1->board;
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("productid", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "productid", buf1, sizeof(buf1)) >= 0) {
- 		for (e1 = bcm47xx_board_list_productid; e1->value1; e1++) {
- 			if (!strcmp(buf1, e1->value1))
- 				return &e1->board;
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("ModelId", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "ModelId", buf1, sizeof(buf1)) >= 0) {
- 		for (e1 = bcm47xx_board_list_ModelId; e1->value1; e1++) {
- 			if (!strcmp(buf1, e1->value1))
- 				return &e1->board;
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("melco_id", buf1, sizeof(buf1)) >= 0 ||
--	    bcm47xx_nvram_getenv("buf1falo_id", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "melco_id", buf1, sizeof(buf1)) >= 0 ||
-+	    bcm47xx_nvram_getenv(NULL, "buf1falo_id", buf1, sizeof(buf1)) >= 0) {
- 		/* buffalo hardware, check id for specific hardware matches */
- 		for (e1 = bcm47xx_board_list_melco_id; e1->value1; e1++) {
- 			if (!strcmp(buf1, e1->value1))
-@@ -247,8 +247,8 @@ static __init const struct bcm47xx_board
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("boot_hw_model", buf1, sizeof(buf1)) >= 0 &&
--	    bcm47xx_nvram_getenv("boot_hw_ver", buf2, sizeof(buf2)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "boot_hw_model", buf1, sizeof(buf1)) >= 0 &&
-+	    bcm47xx_nvram_getenv(NULL, "boot_hw_ver", buf2, sizeof(buf2)) >= 0) {
- 		for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) {
- 			if (!strcmp(buf1, e2->value1) &&
- 			    !strcmp(buf2, e2->value2))
-@@ -256,16 +256,16 @@ static __init const struct bcm47xx_board
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("board_id", buf1, sizeof(buf1)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "board_id", buf1, sizeof(buf1)) >= 0) {
- 		for (e1 = bcm47xx_board_list_board_id; e1->value1; e1++) {
- 			if (!strcmp(buf1, e1->value1))
- 				return &e1->board;
- 		}
- 	}
- 
--	if (bcm47xx_nvram_getenv("boardtype", buf1, sizeof(buf1)) >= 0 &&
--	    bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0 &&
--	    bcm47xx_nvram_getenv("boardrev", buf3, sizeof(buf3)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "boardtype", buf1, sizeof(buf1)) >= 0 &&
-+	    bcm47xx_nvram_getenv(NULL, "boardnum", buf2, sizeof(buf2)) >= 0 &&
-+	    bcm47xx_nvram_getenv(NULL, "boardrev", buf3, sizeof(buf3)) >= 0) {
- 		for (e3 = bcm47xx_board_list_board; e3->value1; e3++) {
- 			if (!strcmp(buf1, e3->value1) &&
- 			    !strcmp(buf2, e3->value2) &&
-@@ -286,7 +286,7 @@ void __init bcm47xx_board_detect(void)
- 		return;
- 
- 	/* check if the nvram is available */
--	err = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));
-+	err = bcm47xx_nvram_getenv(NULL, "boardtype", buf, sizeof(buf));
- 
- 	/* init of nvram failed, probably too early now */
- 	if (err == -ENXIO) {
---- a/arch/mips/bcm47xx/nvram.c
-+++ b/arch/mips/bcm47xx/nvram.c
-@@ -158,7 +158,8 @@ static int nvram_init(void)
- 	return -ENXIO;
- }
- 
--int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len)
-+int bcm47xx_nvram_getenv(const struct device *dev, const char *name, char *val,
-+			 size_t val_len)
- {
- 	char *var, *value, *end, *eq;
- 	int err;
-@@ -190,7 +191,7 @@ int bcm47xx_nvram_getenv(char *name, cha
- }
- EXPORT_SYMBOL(bcm47xx_nvram_getenv);
- 
--int bcm47xx_nvram_gpio_pin(const char *name)
-+int bcm47xx_nvram_gpio_pin(const struct device *dev, const char *name)
- {
- 	int i, err;
- 	char nvram_var[10];
-@@ -200,7 +201,7 @@ int bcm47xx_nvram_gpio_pin(const char *n
- 		err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i);
- 		if (err <= 0)
- 			continue;
--		err = bcm47xx_nvram_getenv(nvram_var, buf, sizeof(buf));
-+		err = bcm47xx_nvram_getenv(dev, nvram_var, buf, sizeof(buf));
- 		if (err <= 0)
- 			continue;
- 		if (!strcmp(name, buf))
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -123,7 +123,7 @@ static int bcm47xx_get_invariants(struct
- 	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
- 	bcm47xx_fill_sprom(&iv->sprom, NULL, false);
- 
--	if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
-+	if (bcm47xx_nvram_getenv(NULL, "cardbus", buf, sizeof(buf)) >= 0)
- 		iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
- 
- 	return 0;
-@@ -146,7 +146,7 @@ static void __init bcm47xx_register_ssb(
- 		panic("Failed to initialize SSB bus (err %d)", err);
- 
- 	mcore = &bcm47xx_bus.ssb.mipscore;
--	if (bcm47xx_nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) {
-+	if (bcm47xx_nvram_getenv(NULL, "kernel_args", buf, sizeof(buf)) >= 0) {
- 		if (strstr(buf, "console=ttyS1")) {
- 			struct ssb_serial_port port;
- 
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -50,10 +50,10 @@ static int get_nvram_var(const char *pre
- 
- 	create_key(prefix, postfix, name, key, sizeof(key));
- 
--	err = bcm47xx_nvram_getenv(key, buf, len);
-+	err = bcm47xx_nvram_getenv(NULL, key, buf, len);
- 	if (fallback && err == -ENOENT && prefix) {
- 		create_key(NULL, postfix, name, key, sizeof(key));
--		err = bcm47xx_nvram_getenv(key, buf, len);
-+		err = bcm47xx_nvram_getenv(NULL, key, buf, len);
- 	}
- 	return err;
- }
---- a/arch/mips/bcm47xx/time.c
-+++ b/arch/mips/bcm47xx/time.c
-@@ -61,7 +61,7 @@ void __init plat_time_init(void)
- 	}
- 
- 	if (chip_id == 0x5354) {
--		len = bcm47xx_nvram_getenv("clkfreq", buf, sizeof(buf));
-+		len = bcm47xx_nvram_getenv(NULL, "clkfreq", buf, sizeof(buf));
- 		if (len >= 0 && !strncmp(buf, "200", 4))
- 			hz = 100000000;
- 	}
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
 @@ -515,6 +515,11 @@ config SRAM
@@ -258,81 +80,17 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  obj-y				+= mic/
  obj-$(CONFIG_GENWQE)		+= genwqe/
 +obj-$(CONFIG_BCM47XX_NVRAM)	+= bcm47xx-nvram.o
---- a/drivers/net/ethernet/broadcom/b44.c
-+++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -411,7 +411,7 @@ static void b44_wap54g10_workaround(stru
- 	 * see https://dev.openwrt.org/ticket/146
- 	 * check and reset bit "isolate"
- 	 */
--	if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) < 0)
-+	if (bcm47xx_nvram_getenv(NULL, "boardnum", buf, sizeof(buf)) < 0)
- 		return;
- 	if (simple_strtoul(buf, NULL, 0) == 2) {
- 		err = __b44_readphy(bp, 0, MII_BMCR, &val);
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -974,7 +974,8 @@ static void bgmac_chip_reset(struct bgma
- 			     BGMAC_CHIPCTL_1_IF_TYPE_MII;
- 		char buf[4];
- 
--		if (bcm47xx_nvram_getenv("et_swtype", buf, sizeof(buf)) > 0) {
-+		if (bcm47xx_nvram_getenv(NULL, "et_swtype", buf,
-+					 sizeof(buf)) > 0) {
- 			if (kstrtou8(buf, 0, &et_swtype))
- 				bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n",
- 					  buf);
-@@ -1534,7 +1535,7 @@ static int bgmac_probe(struct bcma_devic
- 	}
- 
- 	bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK;
--	if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0)
-+	if (bcm47xx_nvram_getenv(NULL, "et0_no_txint", NULL, 0) == 0)
- 		bgmac->int_mask &= ~BGMAC_IS_TX_MASK;
- 
- 	/* TODO: reset the external phy. Specs are needed */
---- a/drivers/ssb/driver_chipcommon_pmu.c
-+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -319,7 +319,8 @@ static void ssb_pmu_pll_init(struct ssb_
- 
- 	if (bus->bustype == SSB_BUSTYPE_SSB) {
- 		char buf[20];
--		if (bcm47xx_nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
-+		if (bcm47xx_nvram_getenv(NULL, "xtalfreq", buf,
-+					 sizeof(buf)) >= 0)
- 			crystalfreq = simple_strtoul(buf, NULL, 0);
- 	}
- 
 --- a/include/linux/bcm47xx_nvram.h
 +++ b/include/linux/bcm47xx_nvram.h
-@@ -15,18 +15,23 @@
+@@ -15,7 +15,7 @@
  #include <linux/types.h>
  #include <linux/kernel.h>
  
 -#ifdef CONFIG_BCM47XX
--int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
-+struct device;
- 
--int bcm47xx_nvram_gpio_pin(const char *name);
 +#if defined(CONFIG_BCM47XX) || defined(CONFIG_BCM47XX_NVRAM)
-+int bcm47xx_nvram_getenv(const struct device *dev, const char *name, char *val,
-+			 size_t val_len);
-+
-+int bcm47xx_nvram_gpio_pin(const struct device *dev, const char *name);
- #else
--static inline int bcm47xx_nvram_getenv(const char *name, char *val,
-+static inline int bcm47xx_nvram_getenv(const struct device *dev,
-+				       const char *name, char *val,
- 				       size_t val_len)
- {
- 	return -ENXIO;
- }
+ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
  
--static inline int bcm47xx_nvram_gpio_pin(const char *name)
-+static inline int bcm47xx_nvram_gpio_pin(const struct device *dev,
-+					 const char *name)
- {
- 	return -ENXIO;
- }
+ int bcm47xx_nvram_gpio_pin(const char *name);
 --- a/drivers/misc/bcm47xx-nvram.c
 +++ b/drivers/misc/bcm47xx-nvram.c
 @@ -28,7 +28,7 @@