diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-20 19:41:17 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-20 19:41:17 +0000 |
| commit | 0474d29e5e7d175370d3e485a58c6e06aeba6f7e (patch) | |
| tree | 966c7d1a7a456cf69c90d0c58e357c63fb5dd0bc /target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch | |
| parent | e9b1c9936ab90ce3b22575985da89775d2c953f9 (diff) | |
brcm47xx: fix for boardflags by xMff
and checkpatch.pl fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22318 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch b/target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch index d3831d105d..f3213d6f63 100644 --- a/target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch +++ b/target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch @@ -1,4 +1,4 @@ -From 493d4a90850509e5f09b4799d4fc234b734a9d30 Mon Sep 17 00:00:00 2001 +From f382c623892dad1c6a9ebc0e12d01fd45ee50db8 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens <hauke@hauke-m.de> Date: Sun, 18 Jul 2010 13:34:32 +0200 Subject: [PATCH 2/5] MIPS: BCM47xx: Fill more values into ssb sprom @@ -10,19 +10,19 @@ drivers needs them. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- - arch/mips/bcm47xx/setup.c | 125 +++++++++++++++++++++++++++++++++------------ - 1 files changed, 92 insertions(+), 33 deletions(-) + arch/mips/bcm47xx/setup.c | 130 +++++++++++++++++++++++++++++++++----------- + 1 files changed, 97 insertions(+), 33 deletions(-) --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c -@@ -74,6 +74,89 @@ static void str2eaddr(char *str, char *d +@@ -74,6 +74,94 @@ static void str2eaddr(char *str, char *d } } +static void bcm47xx_fill_sprom(struct ssb_sprom *sprom) +{ + char buf[100]; -+ u64 boardflags; ++ u32 boardflags; + + memset(sprom, 0, sizeof(struct ssb_sprom)); + @@ -93,19 +93,24 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + + if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 || + cfe_getenv("boardflags", buf, sizeof(buf)) >= 0) -+ boardflags = simple_strtoll(buf, NULL, 0); ++ boardflags = simple_strtoul(buf, NULL, 0); + if (boardflags) { -+ sprom->boardflags_lo = (boardflags & 0x000000000000FFFFLLU); -+ sprom->boardflags_hi = (boardflags & 0x00000000FFFF0000LLU) >> 16; -+ sprom->boardflags2_lo = (boardflags & 0x0000FFFF00000000LLU) >> 32; -+ sprom->boardflags2_hi = (boardflags & 0xFFFF000000000000LLU) >> 48; ++ sprom->boardflags_lo = (boardflags & 0x0000FFFFU); ++ sprom->boardflags_hi = (boardflags & 0xFFFF0000U) >> 16; ++ } ++ if (nvram_getenv("boardflags2", buf, sizeof(buf)) >= 0 || ++ cfe_getenv("boardflags2", buf, sizeof(buf)) >= 0) ++ boardflags = simple_strtoul(buf, NULL, 0); ++ if (boardflags) { ++ sprom->boardflags2_lo = (boardflags & 0x0000FFFFU); ++ sprom->boardflags2_hi = (boardflags & 0xFFFF0000U) >> 16; + } +} + static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv) { -@@ -82,43 +165,19 @@ static int bcm47xx_get_invariants(struct +@@ -82,43 +170,19 @@ static int bcm47xx_get_invariants(struct /* Fill boardinfo structure */ memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo)); |