ssb: pick SoC invariants code from MIPS BCM47xx arch

There is code in ssb fetching "invariants" that is basically a set of
board specific data. Every host requires its own implementation of
reading function. In ssb we have support for PCI, PCMCIA & SDIO.
For some (historical?) reason code reading "invariants" for SoC was
placed in arch code and provided by a callback. This is not needed
nowadays, so lets move that into ssb. This way we keep all "invariants"
functions in a single module making code cleaner.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

1 files changed, 1 insertions, 38 deletions

diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 6d38948f0f1e..c807e32d6d81 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -101,50 +101,13 @@ static void bcm47xx_machine_halt(void)
 }
 
 #ifdef CONFIG_BCM47XX_SSB
-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));
-
-        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);
-
-        if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
-                iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
-
-        return 0;
-}
-
 static void __init bcm47xx_register_ssb(void)
 {
         int err;
         char buf[100];
         struct ssb_mipscore *mcore;
 
-        err = ssb_bus_ssbbus_register(&bcm47xx_bus.ssb, SSB_ENUM_BASE,
-                                      bcm47xx_get_invariants);
+        err = ssb_bus_host_soc_register(&bcm47xx_bus.ssb, SSB_ENUM_BASE);
         if (err)
                 panic("Failed to initialize SSB bus (err %d)", err);