commit 5061b4c98b612f38080de4b341ae55de0a3d7f8f
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 17 06:59:00 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 17 06:59:00 2014 -0700
tree d3894a2970c8c29e957db86b767551b4980962d5
parent 0fe4cd12a54914df4ad95520aa2493b5d5723438
parent 559dcda41d90b4da9bc41d20c0c7b1226e5a8cc0

Merge "target: msm8226: Fix spmi lockup issue"

target/msm8226/init.c

diff --git a/target/msm8226/init.c b/target/msm8226/init.c
index 2a41004..74baa49 100644
--- a/target/msm8226/init.c
+++ b/target/msm8226/init.c
@@ -357,11 +357,17 @@
 
 void reboot_device(unsigned reboot_reason)
 {
+	int ret = 0;
+
 	writel(reboot_reason, RESTART_REASON_ADDR);
 
 	/* Configure PMIC for warm reset */
 	pm8x41_reset_configure(PON_PSHOLD_WARM_RESET);
 
+	ret = scm_halt_pmic_arbiter();
+	if (ret)
+		dprintf(CRITICAL , "Failed to halt pmic arbiter: %d\n", ret);
+
 	/* Drop PS_HOLD for MSM */
 	writel(0x00, MPM2_MPM_PS_HOLD);