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: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index efb037f9c98a23a4c6741ad28053a97a511f774e..206edd3ba668de63dcbe3b928c9dc7a16b0025cd 100644 (file)
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -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)

diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index f7b9100686c3dd4951bebcd6543b869905a208df..c0f707ac192baf6e1f33612ab5da05d288083259 100644 (file)
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -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