Commit 673335c8f0c24912d57abf9b8cd10c9d91ff1a40

Authored by Hauke Mehrtens
Committed by John W. Linville
1 parent bf7d420b4a

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>

Showing 2 changed files with 3 additions and 0 deletions Side-by-side Diff

... ... @@ -458,6 +458,7 @@
458 458 SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
459 459 SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
460 460 SSB_SPROM4_ETHPHY_ET1A_SHIFT);
  461 + SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
461 462 if (out->revision == 4) {
462 463 SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
463 464 SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
... ... @@ -530,6 +531,7 @@
530 531 v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
531 532 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
532 533 }
  534 + SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
533 535 SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
534 536 SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
535 537 SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
include/linux/ssb/ssb_regs.h
... ... @@ -268,6 +268,7 @@
268 268 #define SSB_SPROM3_OFDMGPO 0x107A /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
269 269  
270 270 /* SPROM Revision 4 */
  271 +#define SSB_SPROM4_BOARDREV 0x0042 /* Board revision */
271 272 #define SSB_SPROM4_BFLLO 0x0044 /* Boardflags (low 16 bits) */
272 273 #define SSB_SPROM4_BFLHI 0x0046 /* Board Flags Hi */
273 274 #define SSB_SPROM4_BFL2LO 0x0048 /* Board flags 2 (low 16 bits) */