summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-09-29 20:36:18 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-10-19 15:52:48 -0400
commitd954162c54ea81cee12acec1ee5fa19214d0de96 (patch)
treef2237230a5a14271d41ca15a54b830054e7cf1bb
parent54c974984e8840c9e20390ce16e3d9f4ea674499 (diff)
ssb: add attribute to indicate a parallel flash is available
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/ssb/driver_mipscore.c2
-rw-r--r--include/linux/ssb/ssb_driver_mips.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index dcad2c40836e..b918ba922306 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -192,6 +192,7 @@ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
/* When there is no chipcommon on the bus there is 4MB flash */
if (!bus->chipco.dev) {
+ mcore->pflash.present = true;
mcore->pflash.buswidth = 2;
mcore->pflash.window = SSB_FLASH1;
mcore->pflash.window_size = SSB_FLASH1_SZ;
@@ -206,6 +207,7 @@ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
break;
case SSB_CHIPCO_FLASHT_PARA:
pr_debug("Found parallel flash\n");
+ mcore->pflash.present = true;
mcore->pflash.window = SSB_FLASH2;
mcore->pflash.window_size = SSB_FLASH2_SZ;
if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG)
diff --git a/include/linux/ssb/ssb_driver_mips.h b/include/linux/ssb/ssb_driver_mips.h
index 5d057db53071..07a9c7a2e088 100644
--- a/include/linux/ssb/ssb_driver_mips.h
+++ b/include/linux/ssb/ssb_driver_mips.h
@@ -14,6 +14,7 @@ struct ssb_serial_port {
};
struct ssb_pflash {
+ bool present;
u8 buswidth;
u32 window;
u32 window_size;