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

ssb/bcma: fill attribute alpha2 from sprom 



The attribute country_code and alpha2 are two different attributes in
the sprom. country_code contains some code in an 8 bit coding and
alpha2 contains two chars with the country code. The attributes where
read out wrongly in the past and country_code is only available on
sprom version 1.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Tested-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a2559556

drivers/bcma/sprom.c

+2 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 
	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, ~0, 0);

	SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, ~0, 0);



	SPEX(country_code, SSB_SPROM8_CCODE, ~0, 0);

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

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



	/* Extract cores power info info */

	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {

drivers/ssb/pci.c

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

	SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);

	SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);

	if (out->revision == 1)

		SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,

		     SSB_SPROM1_BINF_CCODE_SHIFT);

	SPEX(ant_available_a, SSB_SPROM1_BINF, SSB_SPROM1_BINF_ANTA,
@@ -387,6 +388,8 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in) 
	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);



	/* Extract the antenna gain values. */

	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
@@ -456,13 +459,15 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in) 
	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,

	     SSB_SPROM4_ETHPHY_ET1A_SHIFT);

	if (out->revision == 4) {

		SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);

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

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

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

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

		SPEX(boardflags2_lo, SSB_SPROM4_BFL2LO, 0xFFFF, 0);

		SPEX(boardflags2_hi, SSB_SPROM4_BFL2HI, 0xFFFF, 0);

	} else {

		SPEX(country_code, SSB_SPROM5_CCODE, 0xFFFF, 0);

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

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

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

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

		SPEX(boardflags2_lo, SSB_SPROM5_BFL2LO, 0xFFFF, 0);
@@ -525,7 +530,8 @@ 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(country_code, SSB_SPROM8_CCODE, 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);

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

	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);

include/linux/ssb/ssb_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ 
#define  SSB_SPROM1_AGAIN_BG_SHIFT	0

#define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */

#define  SSB_SPROM1_AGAIN_A_SHIFT	8

#define SSB_SPROM1_CCODE		0x0076



/* SPROM Revision 2 (inherits from rev 1) */

#define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE