Commit 3c313161 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

bcma: detect SPROM revision 11 



Extracting values from it is still unsupported, but at least we'll
display some meaningful error now.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 17fbaa6e

drivers/bcma/sprom.c

+2 −1
Original line number Diff line number Diff line
@@ -579,7 +579,8 @@ int bcma_sprom_get(struct bcma_bus *bus) 
	u16 offset = BCMA_CC_SPROM;

	u16 *sprom;

	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4,

				 SSB_SPROMSIZE_WORDS_R10, };

				 SSB_SPROMSIZE_WORDS_R10,

				 SSB_SPROMSIZE_WORDS_R11, };

	int i, err = 0;



	if (!bus->drv_cc.core)

include/linux/ssb/ssb_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
#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_SPROMSIZE_WORDS_R11		234

#define SSB_SPROM_BASE1			0x1000

#define SSB_SPROM_BASE31		0x0800

#define SSB_SPROM_REVISION		0x007E