From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 29 Sep 2012 18:33:49 +0000 (+0200)
Subject: bcma: mark pflash as present when available
X-Git-Tag: MMI-PSA29.97-13-9~15401^2~17^2~348
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=360dc31e9cc3f74d0d91a9d19b154c12592f4ffc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

bcma: mark pflash as present when available

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index f44f1fb67011..c0fb1d45c6db 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -190,6 +190,7 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
 		break;
 	case BCMA_CC_FLASHT_PARA:
 		bcma_debug(bus, "Found parallel flash\n");
+		bus->drv_cc.pflash.present = true;
 		bus->drv_cc.pflash.window = 0x1c000000;
 		bus->drv_cc.pflash.window_size = 0x02000000;
 
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index fbde7cbd2d7d..79993969953a 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -510,6 +510,7 @@ struct bcma_chipcommon_pmu {
 
 #ifdef CONFIG_BCMA_DRIVER_MIPS
 struct bcma_pflash {
+	bool present;
 	u8 buswidth;
 	u32 window;
 	u32 window_size;