ssb: trivial: use pflash helper variable

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki 2013-01-25 11:36:25 +01:00 committed by John W. Linville
parent 4a5fc6d707
commit f1ab57e3a1
1 changed files with 10 additions and 9 deletions

View File

@ -189,13 +189,14 @@ static void ssb_mips_serial_init(struct ssb_mipscore *mcore)
static void ssb_mips_flash_detect(struct ssb_mipscore *mcore) static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
{ {
struct ssb_bus *bus = mcore->dev->bus; struct ssb_bus *bus = mcore->dev->bus;
struct ssb_pflash *pflash = &mcore->pflash;
/* When there is no chipcommon on the bus there is 4MB flash */ /* When there is no chipcommon on the bus there is 4MB flash */
if (!ssb_chipco_available(&bus->chipco)) { if (!ssb_chipco_available(&bus->chipco)) {
mcore->pflash.present = true; pflash->present = true;
mcore->pflash.buswidth = 2; pflash->buswidth = 2;
mcore->pflash.window = SSB_FLASH1; pflash->window = SSB_FLASH1;
mcore->pflash.window_size = SSB_FLASH1_SZ; pflash->window_size = SSB_FLASH1_SZ;
return; return;
} }
@ -208,14 +209,14 @@ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
break; break;
case SSB_CHIPCO_FLASHT_PARA: case SSB_CHIPCO_FLASHT_PARA:
pr_debug("Found parallel flash\n"); pr_debug("Found parallel flash\n");
mcore->pflash.present = true; pflash->present = true;
mcore->pflash.window = SSB_FLASH2; pflash->window = SSB_FLASH2;
mcore->pflash.window_size = SSB_FLASH2_SZ; pflash->window_size = SSB_FLASH2_SZ;
if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG) if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG)
& SSB_CHIPCO_CFG_DS16) == 0) & SSB_CHIPCO_CFG_DS16) == 0)
mcore->pflash.buswidth = 1; pflash->buswidth = 1;
else else
mcore->pflash.buswidth = 2; pflash->buswidth = 2;
break; break;
} }
} }