msm: smd: Update 8960 Subsystem Restart Support
Do not set Apps SMSM_RESET bit when Modem signals
a restart since the subsystem restart module
will handle this for 8960.
Signed-off-by: Angshuman Sarkar <angshuman@codeaurora.org>
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index 3e059d1..4907908 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -35,6 +35,7 @@
#include <mach/msm_iomap.h>
#include <mach/system.h>
#include <mach/subsystem_notif.h>
+#include <mach/socinfo.h>
#include "smd_private.h"
#include "proc_comm.h"
@@ -2026,8 +2027,8 @@
/* If we get an interrupt and the apps SMSM_RESET
bit is already set, the modem is acking the
app's reset ack. */
- apps &= ~SMSM_RESET;
-
+ if (!cpu_is_msm8960())
+ apps &= ~SMSM_RESET;
/* Issue a fake irq to handle any
* smd state changes during reset
*/
@@ -2037,7 +2038,8 @@
modem_queue_start_reset_notify();
} else if (modm & SMSM_RESET) {
- apps |= SMSM_RESET;
+ if (!cpu_is_msm8960())
+ apps |= SMSM_RESET;
pr_err("\nSMSM: Modem SMSM state changed to SMSM_RESET.");
modem_queue_start_reset_notify();