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

Commit a7a0bf63 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: pm: export msm_pm_collapse"

parents 468d6acd a939ac13

drivers/power/qcom/msm-pm.c

+7 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static bool msm_pm_pc_hotplug(void) 
	return 0;

}



static int msm_pm_collapse(unsigned long unused)

int msm_pm_collapse(unsigned long unused)

{

	uint32_t cpu = smp_processor_id();

	enum msm_pm_l2_scm_flag flag = MSM_SCM_L2_ON;
@@ -252,6 +252,7 @@ static int msm_pm_collapse(unsigned long unused) 


	return 0;

}

EXPORT_SYMBOL(msm_pm_collapse);



static bool __ref msm_pm_spm_power_collapse(

	unsigned int cpu, bool from_idle, bool notify_rpm)
@@ -282,8 +283,13 @@ static bool __ref msm_pm_spm_power_collapse( 


	msm_jtag_save_state();



#ifdef CONFIG_CPU_V7

	collapsed = save_cpu_regs ?

		!cpu_suspend(0, msm_pm_collapse) : msm_pm_pc_hotplug();

#else

	collapsed = save_cpu_regs ?

		!cpu_suspend(0) : msm_pm_pc_hotplug();

#endif



	if (save_cpu_regs) {

		spin_lock(&cpu_cnt_lock);

include/soc/qcom/pm.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ void __init msm_pm_set_tz_retention_flag(unsigned int flag); 
void msm_pm_enable_retention(bool enable);

bool msm_pm_retention_enabled(void);

void msm_cpu_pm_enter_sleep(enum msm_pm_sleep_mode mode, bool from_idle);

int msm_pm_collapse(unsigned long unused);



#ifdef CONFIG_MSM_PM

void msm_pm_set_rpm_wakeup_irq(unsigned int irq);