MIPS: BCM47xx: Fetch board info directly in callback function

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>

1 files changed, 18 insertions, 1 deletions

diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 17503a05938e..6d38948f0f1e 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);