qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 21:09:53 +02:00
Code

brcm47xx: add missing part from r22385

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22387 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2010-07-25 16:07:40 +00:00
parent 00dc5ed796
commit 1d687ec7f8
1 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
target/linux/brcm47xx/patches-2.6.34/012-MIPS-BCM47xx-Fill-values-for-b43-into-ssb-sprom.patch
View File

@ -1,7 +1,7 @@
From fbdfca0b2489ad94c6a3bc90b47adfd5c8179a89 Mon Sep 17 00:00:00 2001 From f382c623892dad1c6a9ebc0e12d01fd45ee50db8 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de> From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 18 Jul 2010 13:34:32 +0200 Date: Sun, 18 Jul 2010 13:34:32 +0200
Subject: [PATCH 2/5] MIPS: BCM47xx: Fill values for b43 into ssb sprom Subject: [PATCH 2/5] MIPS: BCM47xx: Fill more values into ssb sprom
Most of the values are stored in the nvram and not in the CFE. At first Most of the values are stored in the nvram and not in the CFE. At first
the nvram should be read and if there is no value it should look into the nvram should be read and if there is no value it should look into
@ -10,20 +10,15 @@ drivers needs them.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- ---
arch/mips/bcm47xx/setup.c | 131 +++++++++++++++++++++++++++++++++----------- arch/mips/bcm47xx/setup.c | 130 +++++++++++++++++++++++++++++++++-----------
1 files changed, 98 insertions(+), 33 deletions(-) 1 files changed, 97 insertions(+), 33 deletions(-)
--- a/arch/mips/bcm47xx/setup.c --- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c
@@ -74,6 +74,95 @@ static void str2eaddr(char *str, char *d @@ -74,6 +74,94 @@ static void str2eaddr(char *str, char *d
} }
} }
+#define READ_FROM_NVRAM(_outvar, name, buf) \
+ if (nvram_getenv(name, buf, sizeof(buf)) >= 0 || \
+ cfe_getenv(name, buf, sizeof(buf)) >= 0) \
+ sprom->_outvar = simple_strtoul(buf, NULL, 0);
+
+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom) +static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
+{ +{
+ char buf[100]; + char buf[100];
@ -31,8 +26,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ +
+ memset(sprom, 0, sizeof(struct ssb_sprom)); + memset(sprom, 0, sizeof(struct ssb_sprom));
+ +
+ sprom->revision = 1; /* Fallback: Old hardware does not define this. */ + sprom->revision = 3;
+ READ_FROM_NVRAM(revision, "sromrev", buf);
+ if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0 || + if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0 ||
+ cfe_getenv("il0macaddr", buf, sizeof(buf)) >= 0) + cfe_getenv("il0macaddr", buf, sizeof(buf)) >= 0)
+ str2eaddr(buf, sprom->il0mac); + str2eaddr(buf, sprom->il0mac);
@ -42,55 +36,60 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0 || + if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0 ||
+ cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0) + cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
+ str2eaddr(buf, sprom->et1mac); + str2eaddr(buf, sprom->et1mac);
+ READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf); + if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf); + cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf); + sprom->et0phyaddr = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(et1mdcport, "et1mdcport", buf); + if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(board_rev, "boardrev", buf); + cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(country_code, "ccode", buf); + sprom->et1phyaddr = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(ant_available_a, "aa5g", buf); + if (nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(ant_available_bg, "aa2g", buf); + cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(pa0b0, "pa0b0", buf); + sprom->et0mdcport = !!simple_strtoul(buf, NULL, 10);
+ READ_FROM_NVRAM(pa0b1, "pa0b1", buf); + if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(pa0b2, "pa0b2", buf); + cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(pa1b0, "pa1b0", buf); + sprom->et1mdcport = !!simple_strtoul(buf, NULL, 10);
+ READ_FROM_NVRAM(pa1b1, "pa1b1", buf); + if (nvram_getenv("pa0b0", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(pa1b2, "pa1b2", buf); + cfe_getenv("pa0b0", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(pa1lob0, "pa1lob0", buf); + sprom->pa0b0 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(pa1lob2, "pa1lob1", buf); + if (nvram_getenv("pa0b1", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(pa1lob1, "pa1lob2", buf); + cfe_getenv("pa0b1", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf); + sprom->pa0b1 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf); + if (nvram_getenv("pa0b2", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf); + cfe_getenv("pa0b2", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(gpio0, "wl0gpio0", buf); + sprom->pa0b2 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(gpio1, "wl0gpio1", buf); + if (nvram_getenv("pa1b0", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(gpio2, "wl0gpio2", buf); + cfe_getenv("pa1b0", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(gpio3, "wl0gpio3", buf); + sprom->pa1b0 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(maxpwr_bg, "pa0maxpwr", buf); + if (nvram_getenv("pa1b1", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(maxpwr_al, "pa1lomaxpwr", buf); + cfe_getenv("pa1b1", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(maxpwr_a, "pa1maxpwr", buf); + sprom->pa1b1 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(maxpwr_ah, "pa1himaxpwr", buf); + if (nvram_getenv("pa1b2", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(itssi_a, "pa1itssit", buf); + cfe_getenv("pa1b2", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(itssi_bg, "pa0itssit", buf); + sprom->pa1b2 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(tri2g, "tri2g", buf); + if (nvram_getenv("wl0gpio0", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(tri5gl, "tri5gl", buf); + cfe_getenv("wl0gpio0", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(tri5g, "tri5g", buf); + sprom->gpio0 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(tri5gh, "tri5gh", buf); + if (nvram_getenv("wl0gpio1", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf); + cfe_getenv("wl0gpio1", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf); + sprom->gpio1 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf); + if (nvram_getenv("wl0gpio2", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(rssismc2g, "rssismc2g", buf); + cfe_getenv("wl0gpio2", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(rssismf2g, "rssismf2g", buf); + sprom->gpio2 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(bxa2g, "bxa2g", buf); + if (nvram_getenv("wl0gpio3", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(rssisav5g, "rssisav5g", buf); + cfe_getenv("wl0gpio3", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(rssismc5g, "rssismc5g", buf); + sprom->gpio3 = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf); + if (nvram_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(bxa5g, "bxa5g", buf); + cfe_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf); + sprom->maxpwr_bg = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(ofdm2gpo, "ofdm2gpo", buf); + if (nvram_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0 ||
+ READ_FROM_NVRAM(ofdm5glpo, "ofdm5glpo", buf); + cfe_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0)
+ READ_FROM_NVRAM(ofdm5gpo, "ofdm5gpo", buf); + sprom->maxpwr_a = simple_strtoul(buf, NULL, 0);
+ READ_FROM_NVRAM(ofdm5ghpo, "ofdm5ghpo", buf); + if (nvram_getenv("pa0itssit", buf, sizeof(buf)) >= 0 ||
+ cfe_getenv("pa0itssit", buf, sizeof(buf)) >= 0)
+ sprom->itssi_bg = simple_strtoul(buf, NULL, 0);
+ if (nvram_getenv("pa1itssit", buf, sizeof(buf)) >= 0 ||
+ cfe_getenv("pa1itssit", buf, sizeof(buf)) >= 0)
+ sprom->itssi_a = simple_strtoul(buf, NULL, 0);
+ +
+ if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 || + if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 ||
+ cfe_getenv("boardflags", buf, sizeof(buf)) >= 0) + cfe_getenv("boardflags", buf, sizeof(buf)) >= 0)
@ -111,7 +110,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
static int bcm47xx_get_invariants(struct ssb_bus *bus, static int bcm47xx_get_invariants(struct ssb_bus *bus,
struct ssb_init_invariants *iv) struct ssb_init_invariants *iv)
{ {
@@ -82,43 +171,19 @@ static int bcm47xx_get_invariants(struct @@ -82,43 +170,19 @@ static int bcm47xx_get_invariants(struct
/* Fill boardinfo structure */ /* Fill boardinfo structure */
memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo)); memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));