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

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

bcma: support SPROM rev 10 



This is pretty much the same as rev 9, there are just 2 extra fields we
know about, but are not used/stored yet anyway.

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

drivers/bcma/sprom.c

+9 −7
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ static int bcma_sprom_check_crc(const u16 *sprom, size_t words) 
	return 0;

}



static int bcma_sprom_valid(const u16 *sprom, size_t words)

static int bcma_sprom_valid(struct bcma_bus *bus, const u16 *sprom,

			    size_t words)

{

	u16 revision;

	int err;
@@ -164,11 +165,14 @@ static int bcma_sprom_valid(const u16 *sprom, size_t words) 
		return err;



	revision = sprom[words - 1] & SSB_SPROM_REVISION_REV;

	if (revision != 8 && revision != 9) {

	if (revision != 8 && revision != 9 && revision != 10) {

		pr_err("Unsupported SPROM revision: %d\n", revision);

		return -ENOENT;

	}



	bus->sprom.revision = revision;

	bcma_debug(bus, "Found SPROM revision %d\n", revision);



	return 0;

}
@@ -208,9 +212,6 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 
	BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=

			ARRAY_SIZE(bus->sprom.core_pwr_info));



	bus->sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &

		SSB_SPROM_REVISION_REV;



	for (i = 0; i < 3; i++) {

		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];

		*(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
@@ -549,7 +550,8 @@ int bcma_sprom_get(struct bcma_bus *bus) 
{

	u16 offset = BCMA_CC_SPROM;

	u16 *sprom;

	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4, };

	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4,

				 SSB_SPROMSIZE_WORDS_R10, };

	int i, err = 0;



	if (!bus->drv_cc.core)
@@ -592,7 +594,7 @@ int bcma_sprom_get(struct bcma_bus *bus) 
			return -ENOMEM;



		bcma_sprom_read(bus, offset, sprom, words);

		err = bcma_sprom_valid(sprom, words);

		err = bcma_sprom_valid(bus, sprom, words);

		if (!err)

			break;

include/linux/ssb/ssb_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
#define SSB_SPROMSIZE_WORDS_R4		220

#define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))

#define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))

#define SSB_SPROMSIZE_WORDS_R10		230

#define SSB_SPROM_BASE1			0x1000

#define SSB_SPROM_BASE31		0x0800

#define SSB_SPROM_REVISION		0x007E