aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ssb/pci.c
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-04-28 20:04:11 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-05-16 12:45:21 -0400
commit673335c8f0c24912d57abf9b8cd10c9d91ff1a40 (patch)
tree028fda314370f61fc767fa9a4cb575e466b74c04 /drivers/ssb/pci.c
parentbf7d420b4a3ea06d9638ec7f1b9d7971fa7f4f66 (diff)
ssb: fill board_rev attribute from sprom
This attribute is now used in b43 driver and should be filled for all sprom versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb/pci.c')
-rw-r--r--drivers/ssb/pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 82589d447f85..2cb604d142f4 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -458,6 +458,7 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
458 SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0); 458 SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
459 SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A, 459 SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
460 SSB_SPROM4_ETHPHY_ET1A_SHIFT); 460 SSB_SPROM4_ETHPHY_ET1A_SHIFT);
461 SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
461 if (out->revision == 4) { 462 if (out->revision == 4) {
462 SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8); 463 SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
463 SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0); 464 SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
@@ -530,6 +531,7 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
530 v = in[SPOFF(SSB_SPROM8_IL0MAC) + i]; 531 v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
531 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v); 532 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
532 } 533 }
534 SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
533 SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8); 535 SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
534 SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0); 536 SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
535 SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0); 537 SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);