linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 10/17] ARM: exynos: cpuidle: Move exynos_set_wakeupmask in the cpu_pm notifier
Date: Fri,  4 Apr 2014 15:43:02 +0200	[thread overview]
Message-ID: <1396618989-2897-11-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1396618989-2897-1-git-send-email-daniel.lezcano@linaro.org>

Let's encapsulate more the PM code inside the PM file by moving the
'exynos_set_wakeupmask' function inside the pm.c and the call in the cpu_pm
notifier.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 arch/arm/mach-exynos/cpuidle.c |    7 -------
 arch/arm/mach-exynos/pm.c      |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index ce31004..01444ed 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -58,15 +58,8 @@
 #define PWR_CTRL2_CORE2_UP_RATIO		(1 << 4)
 #define PWR_CTRL2_CORE1_UP_RATIO		(1 << 0)
 
-/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
-static void exynos_set_wakeupmask(void)
-{
-	__raw_writel(0x0000ff3e, S5P_WAKEUP_MASK);
-}
-
 static int idle_finisher(unsigned long flags)
 {
-	exynos_set_wakeupmask();
 
 	__raw_writel(virt_to_phys(s3c_cpu_resume), REG_DIRECTGO_ADDR);
 	__raw_writel(S5P_CHECK_AFTR, REG_DIRECTGO_FLAG);
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 9773a00..c8b3dc4 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -322,6 +322,12 @@ static const struct platform_suspend_ops exynos_suspend_ops = {
 	.valid		= suspend_valid_only_mem,
 };
 
+/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
+static void exynos_set_wakeupmask(void)
+{
+	__raw_writel(0x0000ff3e, S5P_WAKEUP_MASK);
+}
+
 static int exynos_cpu_pm_notifier(struct notifier_block *self,
 				  unsigned long cmd, void *v)
 {
@@ -331,6 +337,7 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,
 	case CPU_PM_ENTER:
 		if (cpu == 0) {
 			exynos_cpu_save_register();
+			exynos_set_wakeupmask();
 		}
 		break;
 
-- 
1.7.9.5

  parent reply	other threads:[~2014-04-04 13:43 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-04 13:42 [PATCH V2 00/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle Daniel Lezcano
2014-04-04 13:42 ` [PATCH V2 01/17] ARM: exynos: cpuidle: Prevent forward declaration Daniel Lezcano
2014-04-04 15:24   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:42 ` [PATCH V2 02/17] ARM: exynos: cpuidle: use cpuidle_register Daniel Lezcano
2014-04-04 15:28   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:42 ` [PATCH V2 03/17] ARM: exynos: cpuidle: change function name prefix Daniel Lezcano
2014-04-04 15:28   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:42 ` [PATCH V2 04/17] ARM: exynos: cpuidle: encapsulate register access inside a function Daniel Lezcano
2014-04-04 15:28   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:42 ` [PATCH V2 05/17] ARM: exynos: cpuidle: Move some code inside the idle_finisher Daniel Lezcano
2014-04-04 15:29   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:42 ` [PATCH V2 06/17] ARM: exynos: cpuidle: Fix S5P_WAKEUP_STAT call Daniel Lezcano
2014-04-04 15:29   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:42 ` [PATCH V2 07/17] ARM: exynos: cpuidle: Use the cpu_pm notifier Daniel Lezcano
2014-04-04 15:30   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 08/17] ARM: exynos: cpuidle: Move scu_enable in " Daniel Lezcano
2014-04-04 15:30   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 09/17] ARM: exynos: cpuidle: Remove ifdef for scu_enable Daniel Lezcano
2014-04-04 15:31   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` Daniel Lezcano [this message]
2014-04-04 15:31   ` [PATCH V2 10/17] ARM: exynos: cpuidle: Move exynos_set_wakeupmask in the cpu_pm notifier Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 11/17] ARM: exynos: cpuidle: Move the power sequence call " Daniel Lezcano
2014-04-04 15:31   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 12/17] ARM: exynos: cpuidle: Move S5P_CHECK_AFTR in a header Daniel Lezcano
2014-04-04 15:32   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 13/17] ARM: exynos: cpuidle: Move clock setup to pm.c Daniel Lezcano
2014-04-04 15:35   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 14/17] ARM: exynos: cpuidle: Move the boot vector in pm.c Daniel Lezcano
2014-04-04 15:35   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 15/17] ARM: exynos: cpuidle: Pass the AFTR callback to the platform_data Daniel Lezcano
2014-04-04 15:35   ` Bartlomiej Zolnierkiewicz
2014-04-04 13:43 ` [PATCH V2 16/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle directory Daniel Lezcano
2014-04-04 15:36   ` Bartlomiej Zolnierkiewicz
2014-04-07  9:51   ` Sachin Kamat
2014-04-07 11:53     ` Daniel Lezcano
2014-04-04 13:43 ` [PATCH V2 17/17] ARM: exynos: config: Enable cpuidle Daniel Lezcano
2014-04-04 16:09   ` Bartlomiej Zolnierkiewicz
2014-04-07  9:43     ` Daniel Lezcano
2014-04-07 16:19       ` Bartlomiej Zolnierkiewicz
2014-04-07 16:26         ` Olof Johansson
2014-04-07 16:28     ` Olof Johansson
2014-04-07 17:44       ` Bartlomiej Zolnierkiewicz
2014-04-07 18:33         ` Olof Johansson
2014-04-08  3:57           ` Sachin Kamat
2014-04-08  9:40             ` Bartlomiej Zolnierkiewicz
2014-04-08  9:26           ` Bartlomiej Zolnierkiewicz

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=1396618989-2897-11-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).