aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ssb/pci.c3
-rw-r--r--include/linux/ssb/ssb.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index ed2a38752274..b434df75047f 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -377,6 +377,8 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
377 SSB_SPROM1_ITSSI_A_SHIFT); 377 SSB_SPROM1_ITSSI_A_SHIFT);
378 SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0); 378 SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
379 SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0); 379 SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
380 if (out->revision >= 2)
381 SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
380 382
381 /* Extract the antenna gain values. */ 383 /* Extract the antenna gain values. */
382 gain = r123_extract_antgain(out->revision, in, 384 gain = r123_extract_antgain(out->revision, in,
@@ -418,6 +420,7 @@ static void sprom_extract_r4(struct ssb_sprom *out, const u16 *in)
418 SSB_SPROM4_ETHPHY_ET1A_SHIFT); 420 SSB_SPROM4_ETHPHY_ET1A_SHIFT);
419 SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0); 421 SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
420 SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0); 422 SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
423 SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
421 SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A, 424 SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
422 SSB_SPROM4_ANTAVAIL_A_SHIFT); 425 SSB_SPROM4_ANTAVAIL_A_SHIFT);
423 SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG, 426 SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG,
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 1ab4688c678b..e18f5c23b930 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -43,6 +43,7 @@ struct ssb_sprom {
43 u8 itssi_a; /* Idle TSSI Target for A-PHY */ 43 u8 itssi_a; /* Idle TSSI Target for A-PHY */
44 u8 itssi_bg; /* Idle TSSI Target for B/G-PHY */ 44 u8 itssi_bg; /* Idle TSSI Target for B/G-PHY */
45 u16 boardflags_lo; /* Boardflags (low 16 bits) */ 45 u16 boardflags_lo; /* Boardflags (low 16 bits) */
46 u16 boardflags_hi; /* Boardflags (high 16 bits) */
46 47
47 /* Antenna gain values for up to 4 antennas 48 /* Antenna gain values for up to 4 antennas
48 * on each band. Values in dBm/4 (Q5.2). Negative gain means the 49 * on each band. Values in dBm/4 (Q5.2). Negative gain means the