diff options
| author | Hauke Mehrtens | 2012-12-06 22:25:05 +0100 |
|---|---|---|
| committer | John Crispin | 2013-02-15 19:01:57 +0100 |
| commit | 6404b7cb83273623dc836a33427a30e371dab11b (patch) | |
| tree | 4eb88c80dc1cae8f5c3c3caa0d86a14d780db5a1 | |
| parent | MIPS: BCM47XX: select NO_EXCEPT_FILL (diff) | |
| download | kernel-qcow2-linux-6404b7cb83273623dc836a33427a30e371dab11b.tar.gz kernel-qcow2-linux-6404b7cb83273623dc836a33427a30e371dab11b.tar.xz kernel-qcow2-linux-6404b7cb83273623dc836a33427a30e371dab11b.zip | |
MIPS: BCM47XX: use fallback sprom var for board_{rev,type}
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 <hauke@hauke-m.de>
Patchwork: http://patchwork.linux-mips.org/patch/4679/
Signed-off-by: John Crispin <blogic@openwrt.org>
| -rw-r--r-- | arch/mips/bcm47xx/sprom.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c index 38492301a7b5..7d97a5a4bd3f 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, |