Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3623b266 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

ssb: extract board_type from SPROM 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 83c78da9

drivers/ssb/pci.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -369,6 +369,7 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in) 
	SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);

	SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);

	SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);

	SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);

	SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);

	SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);

	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);

	if (out->revision == 1)

	if (out->revision == 1)

		SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,

		SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,

		     SSB_SPROM1_BINF_CCODE_SHIFT);

		     SSB_SPROM1_BINF_CCODE_SHIFT);
@@ -464,6 +465,7 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in) 
	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,

	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,

	     SSB_SPROM4_ETHPHY_ET1A_SHIFT);

	     SSB_SPROM4_ETHPHY_ET1A_SHIFT);

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

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

	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);

	if (out->revision == 4) {

	if (out->revision == 4) {

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

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

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

		SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
@@ -535,6 +537,7 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in) 
	sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]);

	sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]);





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

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

	SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);

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

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

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

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

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

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