commit fc8a464fdf9ffce0d9324b2f9787254ba5870bbf
author Linux Build Service Account <lnxbuild@localhost> Mon May 05 15:13:06 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 05 15:13:05 2014 -0700
tree 7ef171ae7d6987420a2276c19a9e77c878a05b30
parent 6bf8419d4830fc9e6c6ff41df3f18b262b120d2f
parent bca27a9ea798f42ac574d645648854a3c04bc9d0

Merge "msm: pil-pronto: Set PMU register SSR bit to indicate WCNSS"

arch/arm/mach-msm/pil-pronto.c

diff --git a/arch/arm/mach-msm/pil-pronto.c b/arch/arm/mach-msm/pil-pronto.c
index a7fc204..a91331e 100644
--- a/arch/arm/mach-msm/pil-pronto.c
+++ b/arch/arm/mach-msm/pil-pronto.c
@@ -62,6 +62,9 @@
 
 #define PRONTO_PMU_CCPU_BOOT_REMAP_ADDR			0x2004
 
+#define PRONTO_PMU_SPARE				0x1088
+#define PRONTO_PMU_SPARE_SSR_BIT			BIT(23)
+
 #define CLK_CTL_WCNSS_RESTART_BIT			BIT(0)
 
 #define AXI_HALTREQ					0x0
@@ -376,7 +379,15 @@
 	struct pronto_data *drv = subsys_to_drv(subsys);
 	struct platform_device *pdev = wcnss_get_platform_device();
 	struct wcnss_wlan_config *pwlanconfig = wcnss_get_wlan_config();
-	int    ret = -1;
+	void __iomem *base = drv->base;
+	u32 reg;
+	int ret = -1;
+
+	if (base) {
+		reg = readl_relaxed(base + PRONTO_PMU_SPARE);
+		reg |= PRONTO_PMU_SPARE_SSR_BIT;
+		writel_relaxed(reg, base + PRONTO_PMU_SPARE);
+	}
 
 	if (pdev && pwlanconfig)
 		ret = wcnss_wlan_power(&pdev->dev, pwlanconfig,