[PATCH] MIPS: BCM47XX: use fallback sprom var for board_{rev,type}

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] MIPS: BCM47XX: use fallback sprom var for board_{rev,type}

Hauke Mehrtens-2
An SoC normally do not define path variables for board_rev and
board_type and the Broadcom SDK also uses the nvram values without a
prefix in such cases. Do the same to fill these sprom attributes from
nvram and do not leave them empty, because brcmsmac do not like this.

Signed-off-by: Hauke Mehrtens <[hidden email]>
---
 arch/mips/bcm47xx/sprom.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index 289cc0a..009c1ec 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -652,12 +652,10 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
 static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
     bool fallback)
 {
- nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0,
-       fallback);
+ nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0, true);
  nvram_read_u16(prefix, NULL, "boardnum", &sprom->board_num, 0,
        fallback);
- nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0,
-       fallback);
+ nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0, true);
  nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
  &sprom->boardflags_hi, fallback);
  nvram_read_u32_2(prefix, "boardflags2", &sprom->boardflags2_lo,
--
1.7.10.4