Subject: linux-next: manual merge of the pm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 11 Aug 2014 11:41:10 +1000

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-imx/pm-imx6.c between commit 80c0ecdce802 ("ARM: imx: add
standby mode support for suspend") from Linus' tree and commit
bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
related to sleep") from the pm tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/arm/mach-imx/pm-imx6.c
index 5c3af8f993d0,fb4ae1244abd..000000000000
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@@ -342,22 -314,8 +342,22 @@@ static int imx6q_suspend_finish(unsigne
  static int imx6q_pm_enter(suspend_state_t state)
  {
  	switch (state) {
- 	case PM_SUSPEND_STANDBY:
++	case PM_SUSPEND_SHALLOW:
 +		imx6q_set_lpm(STOP_POWER_ON);
 +		imx6q_set_int_mem_clk_lpm(true);
 +		imx_gpc_pre_suspend(false);
 +		if (cpu_is_imx6sl())
 +			imx6sl_set_wait_clk(true);
 +		/* Zzz ... */
 +		cpu_do_idle();
 +		if (cpu_is_imx6sl())
 +			imx6sl_set_wait_clk(false);
 +		imx_gpc_post_resume();
 +		imx6q_set_lpm(WAIT_CLOCKED);
 +		break;
- 	case PM_SUSPEND_MEM:
+ 	case PM_SUSPEND_DEEP:
  		imx6q_set_lpm(STOP_POWER_OFF);
 +		imx6q_set_int_mem_clk_lpm(false);
  		imx6q_enable_wb(true);
  		/*
  		 * For suspend into ocram, asm code already take care of
@@@ -386,14 -343,9 +386,14 @@@
  	return 0;
  }
  
 +static int imx6q_pm_valid(suspend_state_t state)
 +{
- 	return (state == PM_SUSPEND_STANDBY || state == PM_SUSPEND_MEM);
++	return (state == PM_SUSPEND_SHALLOW || state == PM_SUSPEND_DEEP);
 +}
 +
  static const struct platform_suspend_ops imx6q_pm_ops = {
  	.enter = imx6q_pm_enter,
 -	.valid = suspend_valid_only_deep,
 +	.valid = imx6q_pm_valid,
  };
  
  void __init imx6q_pm_set_ccm_base(void __iomem *base)