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 10/17] ARM: exynos: cpuidle: Move exynos_set_wakeupmask in the cpu_pm notifier
Date: Fri,  4 Apr 2014 09:47:56 +0200	[thread overview]
Message-ID: <1396597683-6969-11-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1396597683-6969-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>
---
 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 c63ad05..7014654 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -59,15 +59,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 c0d8640..3f2ddef 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -374,12 +374,19 @@ early_wakeup:
 	return;
 }
 
+/* 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)
 {
 	switch (cmd) {
 	case CPU_PM_ENTER:
 		exynos_cpu_save_register();
+		exynos_set_wakeupmask();
 		break;
 
 	case CPU_PM_EXIT:
-- 
1.7.9.5

  parent reply	other threads:[~2014-04-04  7:47 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-04  7:47 [PATCH 00/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle Daniel Lezcano
2014-04-04  7:47 ` [PATCH 01/17] ARM: exynos: cpuidle: Prevent forward declaration Daniel Lezcano
2014-04-04  8:42   ` Viresh Kumar
2014-04-04  7:47 ` [PATCH 02/17] ARM: exynos: cpuidle: use cpuidle_register Daniel Lezcano
2014-04-04  8:44   ` Viresh Kumar
2014-04-04  7:47 ` [PATCH 03/17] ARM: exynos: cpuidle: change function name prefix Daniel Lezcano
2014-04-04  8:45   ` Viresh Kumar
2014-04-04  7:47 ` [PATCH 04/17] ARM: exynos: cpuidle: encapsulate register access inside a function Daniel Lezcano
2014-04-04  8:46   ` Viresh Kumar
2014-04-04  7:47 ` [PATCH 05/17] ARM: exynos: cpuidle: Move some code inside the idle_finisher Daniel Lezcano
2014-04-04  8:50   ` Viresh Kumar
2014-04-04  9:02     ` Daniel Lezcano
2014-04-04  7:47 ` [PATCH 06/17] ARM: exynos: cpuidle: Fix S5P_WAKEUP_STAT call Daniel Lezcano
2014-04-04  8:53   ` Viresh Kumar
2014-04-04  7:47 ` [PATCH 07/17] ARM: exynos: cpuidle: Use the cpu_pm notifier Daniel Lezcano
2014-04-04  7:47 ` [PATCH 08/17] ARM: exynos: cpuidle: Move scu_enable in " Daniel Lezcano
2014-04-04  8:57   ` Viresh Kumar
2014-04-04  9:03     ` Daniel Lezcano
2014-04-04  7:47 ` [PATCH 09/17] ARM: exynos: cpuidle: Remove ifdef for scu_enable Daniel Lezcano
2014-04-04  8:58   ` Viresh Kumar
2014-04-04  7:47 ` Daniel Lezcano [this message]
2014-04-04  8:59   ` [PATCH 10/17] ARM: exynos: cpuidle: Move exynos_set_wakeupmask in the cpu_pm notifier Viresh Kumar
2014-04-04  7:47 ` [PATCH 11/17] ARM: exynos: cpuidle: Move the power sequence call " Daniel Lezcano
2014-04-04  9:02   ` Viresh Kumar
2014-04-04  7:47 ` [PATCH 12/17] ARM: exynos: cpuidle: Move S5P_CHECK_AFTR in a header Daniel Lezcano
2014-04-04  9:03   ` Viresh Kumar
2014-04-04  7:47 ` [PATCH 13/17] ARM: exynos: cpuidle: Move clock setup to pm.c Daniel Lezcano
2014-04-04  9:05   ` Viresh Kumar
2014-04-04  7:48 ` [PATCH 14/17] ARM: exynos: cpuidle: Move the boot vector in pm.c Daniel Lezcano
2014-04-04  9:05   ` Viresh Kumar
2014-04-04  7:48 ` [PATCH 15/17] ARM: exynos: cpuidle: Pass the AFTR callback to the platform_data Daniel Lezcano
2014-04-04  9:09   ` Viresh Kumar
2014-04-04  7:48 ` [PATCH 16/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle directory Daniel Lezcano
2014-04-04  9:07   ` Viresh Kumar
2014-04-04  7:48 ` [PATCH 17/17] ARM: exynos: config: Enable cpuidle Daniel Lezcano
2014-04-04  9:10   ` Viresh Kumar
2014-04-04  9:16     ` Daniel Lezcano
2014-04-04  9:00 ` [PATCH 00/17] ARM: exynos: cpuidle: Move the driver to drivers/cpuidle Sachin Kamat
2014-04-04  9:55   ` Daniel Lezcano

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=1396597683-6969-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).