From 597715c61ae75a05ab3310a34ff3857a006f0f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 20 Nov 2014 21:32:42 +0100 Subject: [PATCH] bcma: add table of serial flashes with smaller blocks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- drivers/bcma/driver_chipcommon_sflash.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/bcma/driver_chipcommon_sflash.c b/drivers/bcma/driver_chipcommon_sflash.c index 7e11ef4..25d9e17 100644 --- a/drivers/bcma/driver_chipcommon_sflash.c +++ b/drivers/bcma/driver_chipcommon_sflash.c @@ -9,6 +9,7 @@ #include #include +#include static struct resource bcma_sflash_resource = { .name = "bcma_sflash", @@ -41,6 +42,13 @@ static const struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = { { NULL }, }; +/* Some devices use smaller blocks (and have more of them) */ +static const struct bcma_sflash_tbl_e bcma_sflash_st_shrink_tbl[] = { + { "M25P16", 0x14, 0x1000, 512, }, + { "M25P32", 0x15, 0x1000, 1024, }, + { NULL }, +}; + static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = { { "SST25WF512", 1, 0x1000, 16, }, { "SST25VF512", 0x48, 0x1000, 16, }, @@ -84,6 +92,23 @@ static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode) bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n"); } +const struct bcma_sflash_tbl_e *bcma_sflash_shrink_flash(u32 id) +{ + enum bcm47xx_board board = bcm47xx_board_get(); + const struct bcma_sflash_tbl_e *e; + + switch (board) { + case BCM47XX_BOARD_NETGEAR_WGR614_V10: + for (e = bcma_sflash_st_shrink_tbl; e->name; e++) { + if (e->id == id) + return e; + } + return NULL; + default: + return NULL; + } +} + /* Initialize serial flash access */ int bcma_sflash_init(struct bcma_drv_cc *cc) { @@ -114,6 +139,10 @@ int bcma_sflash_init(struct bcma_drv_cc *cc) case 0x13: return -ENOTSUPP; default: + e = bcma_sflash_shrink_flash(id); + if (e) + break; + for (e = bcma_sflash_st_tbl; e->name; e++) { if (e->id == id) break; -- 1.8.4.5