From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Anson Huang <b20788@freescale.com>,
Shawn Guo <shawn.guo@freescale.com>
Subject: linux-next: manual merge of the pm tree with Linus' tree
Date: Mon, 11 Aug 2014 11:41:10 +1000 [thread overview]
Message-ID: <20140811114110.5e81b8a9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]
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 sfr@canb.auug.org.au
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)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-08-11 1:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 1:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-29 2:01 linux-next: manual merge of the pm tree with Linus' tree Stephen Rothwell
2018-10-30 7:33 ` Rafael J. Wysocki
2015-11-08 23:45 Stephen Rothwell
2015-11-09 0:46 ` Rafael J. Wysocki
2015-11-08 23:45 Stephen Rothwell
2014-08-11 1:43 Stephen Rothwell
2014-08-12 1:11 ` Rafael J. Wysocki
2012-05-18 5:48 Stephen Rothwell
2012-05-18 19:08 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140811114110.5e81b8a9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=b20788@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=shawn.guo@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).