diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-09-29 14:36:18 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-19 15:52:48 -0400 |
commit | d954162c54ea81cee12acec1ee5fa19214d0de96 (patch) | |
tree | f2237230a5a14271d41ca15a54b830054e7cf1bb | |
parent | 54c974984e8840c9e20390ce16e3d9f4ea674499 (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.c | 2 | ||||
-rw-r--r-- | include/linux/ssb/ssb_driver_mips.h | 1 |
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) | |||
192 | 192 | ||
193 | /* When there is no chipcommon on the bus there is 4MB flash */ | 193 | /* When there is no chipcommon on the bus there is 4MB flash */ |
194 | if (!bus->chipco.dev) { | 194 | if (!bus->chipco.dev) { |
195 | mcore->pflash.present = true; | ||
195 | mcore->pflash.buswidth = 2; | 196 | mcore->pflash.buswidth = 2; |
196 | mcore->pflash.window = SSB_FLASH1; | 197 | mcore->pflash.window = SSB_FLASH1; |
197 | mcore->pflash.window_size = SSB_FLASH1_SZ; | 198 | mcore->pflash.window_size = SSB_FLASH1_SZ; |
@@ -206,6 +207,7 @@ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore) | |||
206 | break; | 207 | break; |
207 | case SSB_CHIPCO_FLASHT_PARA: | 208 | case SSB_CHIPCO_FLASHT_PARA: |
208 | pr_debug("Found parallel flash\n"); | 209 | pr_debug("Found parallel flash\n"); |
210 | mcore->pflash.present = true; | ||
209 | mcore->pflash.window = SSB_FLASH2; | 211 | mcore->pflash.window = SSB_FLASH2; |
210 | mcore->pflash.window_size = SSB_FLASH2_SZ; | 212 | mcore->pflash.window_size = SSB_FLASH2_SZ; |
211 | if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG) | 213 | 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 { | |||
14 | }; | 14 | }; |
15 | 15 | ||
16 | struct ssb_pflash { | 16 | struct ssb_pflash { |
17 | bool present; | ||
17 | u8 buswidth; | 18 | u8 buswidth; |
18 | u32 window; | 19 | u32 window; |
19 | u32 window_size; | 20 | u32 window_size; |