Commit 7e4235ac authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

ssb: read additional sprom v2 and v3 attributes. 



These attributes should be in the sprom for rev 2 and 3, but they were
not read out.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 12bef78f

drivers/ssb/pci.c

+18 −2
Original line number Diff line number Diff line
@@ -347,6 +347,21 @@ static s8 r123_extract_antgain(u8 sprom_revision, const u16 *in, 
	return (s8)gain;

}



static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in)

{

	SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);

	SPEX(opo, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);

	SPEX(pa1lob0, SSB_SPROM2_PA1LOB0, 0xFFFF, 0);

	SPEX(pa1lob1, SSB_SPROM2_PA1LOB1, 0xFFFF, 0);

	SPEX(pa1lob2, SSB_SPROM2_PA1LOB2, 0xFFFF, 0);

	SPEX(pa1hib0, SSB_SPROM2_PA1HIB0, 0xFFFF, 0);

	SPEX(pa1hib1, SSB_SPROM2_PA1HIB1, 0xFFFF, 0);

	SPEX(pa1hib2, SSB_SPROM2_PA1HIB2, 0xFFFF, 0);

	SPEX(maxpwr_ah, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_HI, 0);

	SPEX(maxpwr_al, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_LO,

	     SSB_SPROM2_MAXP_A_LO_SHIFT);

}



static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)

{

	u16 loc[3];
@@ -396,8 +411,7 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in) 
	     SSB_SPROM1_ITSSI_A_SHIFT);

	SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);

	SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);

	if (out->revision >= 2)

		SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);



	SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8);

	SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
@@ -408,6 +422,8 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in) 
	out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,

						    SSB_SPROM1_AGAIN_A,

						    SSB_SPROM1_AGAIN_A_SHIFT);

	if (out->revision >= 2)

		sprom_extract_r23(out, in);

}



/* Revs 4 5 and 8 have partially shared layout */