aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ssb
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2013-03-19 08:18:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-03-25 16:43:40 -0400
commit3623b266c8c5012ef376128026ca2dfc63f1abcb (patch)
treebd8b59312e9458e69daefc75d4f38794d0301981 /drivers/ssb
parent83c78da983d672e214b5daedf83b26df95dd8407 (diff)
ssb: extract board_type from SPROM
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/pci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 63ff69f9d3eb..99bd5adac264 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -369,6 +369,7 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
369 SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14); 369 SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);
370 SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15); 370 SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);
371 SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0); 371 SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);
372 SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
372 if (out->revision == 1) 373 if (out->revision == 1)
373 SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE, 374 SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
374 SSB_SPROM1_BINF_CCODE_SHIFT); 375 SSB_SPROM1_BINF_CCODE_SHIFT);
@@ -464,6 +465,7 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
464 SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A, 465 SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
465 SSB_SPROM4_ETHPHY_ET1A_SHIFT); 466 SSB_SPROM4_ETHPHY_ET1A_SHIFT);
466 SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0); 467 SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
468 SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
467 if (out->revision == 4) { 469 if (out->revision == 4) {
468 SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8); 470 SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
469 SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0); 471 SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
@@ -535,6 +537,7 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
535 sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]); 537 sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]);
536 538
537 SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0); 539 SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
540 SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
538 SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8); 541 SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
539 SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0); 542 SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
540 SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0); 543 SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);