Commit 673335c8 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

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: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bf7d420b

drivers/ssb/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in) 
	SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);

	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,

	     SSB_SPROM4_ETHPHY_ET1A_SHIFT);

	SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);

	if (out->revision == 4) {

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

		SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
@@ -530,6 +531,7 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in) 
		v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];

		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);

	}

	SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);

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

	SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);

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

include/linux/ssb/ssb_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ 
#define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */



/* SPROM Revision 4 */

#define SSB_SPROM4_BOARDREV		0x0042	/* Board revision */

#define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */

#define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */

#define SSB_SPROM4_BFL2LO		0x0048	/* Board flags 2 (low 16 bits) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE