102 lines
3.4 KiB
Diff
102 lines
3.4 KiB
Diff
From d8cfb5037bfc875e6dc8e09e4caceb443c04ff6a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
Date: Mon, 26 Oct 2015 11:13:16 +0100
|
|
Subject: [PATCH 3/3] MIPS: BCM47xx: Fetch board info directly in callback
|
|
function
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This drops another symbol dependency between setup.c and sprom.c which
|
|
will allow us to make SPROM code a separated module (and share it with
|
|
ARM).
|
|
Patch tested on Linksys WRT300N V1.
|
|
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Cc: linux-mips@linux-mips.org
|
|
Patchwork: https://patchwork.linux-mips.org/patch/11360/
|
|
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
---
|
|
arch/mips/bcm47xx/setup.c | 19 ++++++++++++++++++-
|
|
arch/mips/bcm47xx/sprom.c | 13 -------------
|
|
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 5 -----
|
|
3 files changed, 18 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
|
|
index 17503a0..6d38948 100644
|
|
--- a/arch/mips/bcm47xx/setup.c
|
|
+++ b/arch/mips/bcm47xx/setup.c
|
|
@@ -105,11 +105,28 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
|
|
struct ssb_init_invariants *iv)
|
|
{
|
|
char buf[20];
|
|
+ int len, err;
|
|
|
|
/* Fill boardinfo structure */
|
|
memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));
|
|
|
|
- bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
|
|
+ len = bcm47xx_nvram_getenv("boardvendor", buf, sizeof(buf));
|
|
+ if (len > 0) {
|
|
+ err = kstrtou16(strim(buf), 0, &iv->boardinfo.vendor);
|
|
+ if (err)
|
|
+ pr_warn("Couldn't parse nvram board vendor entry with value \"%s\"\n",
|
|
+ buf);
|
|
+ }
|
|
+ if (!iv->boardinfo.vendor)
|
|
+ iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
|
|
+
|
|
+ len = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));
|
|
+ if (len > 0) {
|
|
+ err = kstrtou16(strim(buf), 0, &iv->boardinfo.type);
|
|
+ if (err)
|
|
+ pr_warn("Couldn't parse nvram board type entry with value \"%s\"\n",
|
|
+ buf);
|
|
+ }
|
|
|
|
memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
|
|
bcm47xx_fill_sprom(&iv->sprom, NULL, false);
|
|
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
|
|
index 43353db..a7e569c 100644
|
|
--- a/arch/mips/bcm47xx/sprom.c
|
|
+++ b/arch/mips/bcm47xx/sprom.c
|
|
@@ -599,19 +599,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
|
|
bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
|
|
}
|
|
|
|
-#ifdef CONFIG_BCM47XX_SSB
|
|
-void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
|
|
- const char *prefix)
|
|
-{
|
|
- nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0,
|
|
- true);
|
|
- if (!boardinfo->vendor)
|
|
- boardinfo->vendor = SSB_BOARDVENDOR_BCM;
|
|
-
|
|
- nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0, true);
|
|
-}
|
|
-#endif
|
|
-
|
|
#if defined(CONFIG_BCM47XX_SSB)
|
|
static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
|
|
{
|
|
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
|
|
index 1461c10..71e4096 100644
|
|
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
|
|
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
|
|
@@ -48,11 +48,6 @@ extern enum bcm47xx_bus_type bcm47xx_bus_type;
|
|
void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
|
|
bool fallback);
|
|
|
|
-#ifdef CONFIG_BCM47XX_SSB
|
|
-void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
|
|
- const char *prefix);
|
|
-#endif
|
|
-
|
|
void bcm47xx_set_system_type(u16 chip_id);
|
|
|
|
#endif /* __ASM_BCM47XX_H */
|
|
--
|
|
1.8.4.5
|
|
|