Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef2bc5d authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: reset: Fix compilation error when CONFIG_QCOM_DLOAD_MODE=n" into msm-4.8

parents 974132c3 db13f54f

drivers/power/reset/msm-poweroff.c

+2 −6
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static bool scm_deassert_ps_hold_supported; 
/* Download mode master kill-switch */

static void __iomem *msm_ps_hold;

static phys_addr_t tcsr_boot_misc_detect;

static int download_mode = 1;



#ifdef CONFIG_QCOM_DLOAD_MODE

#define EDL_MODE_PROP "qcom,msm-imem-emergency_download_mode"
@@ -64,7 +65,6 @@ static void *emergency_dload_mode_addr; 
static bool scm_dload_supported;



static int dload_set(const char *val, struct kernel_param *kp);

static int download_mode = 1;

module_param_call(download_mode, dload_set, param_get_int,

			&download_mode, 0644);

static int panic_prep_restart(struct notifier_block *this,
@@ -219,10 +219,8 @@ static void halt_spmi_pmic_arbiter(void) 


static void msm_restart_prepare(const char *cmd)

{

#ifdef CONFIG_QCOM_DLOAD_MODE

	bool need_warm_reset = false;





#ifdef CONFIG_QCOM_DLOAD_MODE

	/* Write download mode flags if we're panic'ing

	 * Write download mode flags if restart_mode says so

	 * Kill download mode if master-kill switch is set
@@ -289,8 +287,6 @@ static void msm_restart_prepare(const char *cmd) 
		}

	}



	flush_cache_all();



	/*outer_flush_all is not supported by 64bit kernel*/

#ifndef CONFIG_ARM64

	outer_flush_all();