| To: | john@phrozen.org, ralf@linux-mips.org |
|---|---|
| Subject: | [PATCH] MIPS: BCM47XX: use fallback sprom var for board_{rev,type} |
| From: | Hauke Mehrtens <hauke@hauke-m.de> |
| Date: | Thu, 6 Dec 2012 23:25:05 +0100 |
| Cc: | linux-mips@linux-mips.org, Hauke Mehrtens <hauke@hauke-m.de> |
| List-archive: | <http://www.linux-mips.org/archives/linux-mips/> |
| List-help: | <mailto:ecartis@linux-mips.org?Subject=help> |
| List-id: | linux-mips <linux-mips.eddie.linux-mips.org> |
| List-owner: | <mailto:ralf@linux-mips.org> |
| List-post: | <mailto:linux-mips@linux-mips.org> |
| List-software: | Ecartis version 1.0.0 |
| List-subscribe: | <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips> |
| List-unsubscribe: | <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips> |
| Sender: | linux-mips-bounce@linux-mips.org |
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>
---
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
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: RM9000 / E9000, MSP71xx class processors, SOCs and eval boards, Shane McDonald |
|---|---|
| Next by Date: | Re: [PATCH] MIPS: Check BITS_PER_LONG instead of __SIZEOF_LONG__, David Daney |
| Previous by Thread: | [PATCH] MIPS: Check BITS_PER_LONG instead of __SIZEOF_LONG__, Geert Uytterhoeven |
| Next by Thread: | [PATCH] MIPS: Remove usage of CSRC_R4K_LIB config option., Steven J. Hill |
| Indexes: | [Date] [Thread] [Top] [All Lists] |