Fix reboot to recovery and laf

Quarx2k · Apr 4, 2015 · 25cba9b · 25cba9b
1 parent 318265c
commit 25cba9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/arch/arm/configs/cm11_msm8226_defconfig b/arch/arm/configs/cm11_msm8226_defconfig
@@ -374,7 +374,7 @@ CONFIG_MACH_MSM8226_W7DS_OPEN_CIS=y
 # CONFIG_LGE_BOOTLOADER_TIME_CHECKER is not set
 # CONFIG_LGE_USE_CPU_CLOCK_TIMESTAMP is not set
 # CONFIG_LGE_BNR_RECOVERY_REBOOT is not set
-CONFIG_LGE_QFPROM_INTERFACE=y
+# CONFIG_LGE_QFPROM_INTERFACE is not set
 # CONFIG_LGE_ENABLE_MMC_STRENGTH_CONTROL is not set
 # CONFIG_LGE_PM_BATTERY_CAPACITY_1540mAh is not set
 # CONFIG_LGE_PM_BATTERY_CAPACITY_1700mAh is not set
@@ -522,7 +522,7 @@ CONFIG_MSM_RTB_SEPARATE_CPUS=y
 # CONFIG_MSM_CPR is not set
 # CONFIG_MSM_CACHE_DUMP is not set
 # CONFIG_MSM_HSIC_SYSMON is not set
-# CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL is not set
+CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y
 # CONFIG_USE_DEV_CTRL_VOLUME is not set
 # CONFIG_MSM_CPU_PWRCTL is not set
 CONFIG_MSM_BOOT_STATS=y

diff --git a/arch/arm/mach-msm/restart.c b/arch/arm/mach-msm/restart.c
@@ -303,7 +303,7 @@ static void msm_restart_prepare(const char *cmd)
 			__raw_writel(0x77665555, restart_reason);
 #endif
 		} else if (!strncmp(cmd, "laf", 14)) {
-			restart_mode = RESTART_DLOAD;
+			__raw_writel(0x6C616664, restart_reason);
 		} else if (!strncmp(cmd, "oem-", 4)) {
 			unsigned long code;
 			code = simple_strtoul(cmd + 4, NULL, 16) & 0xff;