All of lore.kernel.org
 help / color / mirror / Atom feed
From: Viresh Kumar <viresh.kumar@linaro.org>
To: rjw@rjwysocki.net
Cc: linaro-kernel@lists.linaro.org, cpufreq@vger.kernel.org,
	linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
	nm@ti.com, swarren@wwwdotorg.org, kgene.kim@samsung.com,
	jinchoi@broadcom.com, tianyu.lan@intel.com,
	sebastian.capella@linaro.org, jhbird.choi@samsung.com,
	Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH V5 6/7] cpufreq: s5pv210: Use cpufreq_generic_suspend()
Date: Thu, 13 Feb 2014 12:20:21 +0530	[thread overview]
Message-ID: <116336822267dca7b3bb0b7581fb03b2dc17d54a.1392273723.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1392273722.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1392273722.git.viresh.kumar@linaro.org>

Currently we have implemented PM notifiers to disable/enable ->target() routines
functionality during suspend/resume.

Now we have support present in cpufreq core, lets use it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 drivers/cpufreq/s5pv210-cpufreq.c | 49 +++------------------------------------
 1 file changed, 3 insertions(+), 46 deletions(-)

diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index 55a8e9f..7242153 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -18,7 +18,6 @@
 #include <linux/cpufreq.h>
 #include <linux/reboot.h>
 #include <linux/regulator/consumer.h>
-#include <linux/suspend.h>
 
 #include <mach/map.h>
 #include <mach/regs-clock.h>
@@ -435,18 +434,6 @@ exit:
 	return ret;
 }
 
-#ifdef CONFIG_PM
-static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy)
-{
-	return 0;
-}
-
-static int s5pv210_cpufreq_resume(struct cpufreq_policy *policy)
-{
-	return 0;
-}
-#endif
-
 static int check_mem_type(void __iomem *dmc_reg)
 {
 	unsigned long val;
@@ -502,6 +489,7 @@ static int __init s5pv210_cpu_init(struct cpufreq_policy *policy)
 	s5pv210_dram_conf[1].refresh = (__raw_readl(S5P_VA_DMC1 + 0x30) * 1000);
 	s5pv210_dram_conf[1].freq = clk_get_rate(dmc1_clk);
 
+	policy->suspend_freq = SLEEP_FREQ;
 	return cpufreq_generic_init(policy, s5pv210_freq_table, 40000);
 
 out_dmc1:
@@ -511,32 +499,6 @@ out_dmc0:
 	return ret;
 }
 
-static int s5pv210_cpufreq_notifier_event(struct notifier_block *this,
-					  unsigned long event, void *ptr)
-{
-	int ret;
-
-	switch (event) {
-	case PM_SUSPEND_PREPARE:
-		ret = cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, 0);
-		if (ret < 0)
-			return NOTIFY_BAD;
-
-		/* Disable updation of cpu frequency */
-		no_cpufreq_access = true;
-		return NOTIFY_OK;
-	case PM_POST_RESTORE:
-	case PM_POST_SUSPEND:
-		/* Enable updation of cpu frequency */
-		no_cpufreq_access = false;
-		cpufreq_driver_target(cpufreq_cpu_get(0), SLEEP_FREQ, 0);
-
-		return NOTIFY_OK;
-	}
-
-	return NOTIFY_DONE;
-}
-
 static int s5pv210_cpufreq_reboot_notifier_event(struct notifier_block *this,
 						 unsigned long event, void *ptr)
 {
@@ -558,15 +520,11 @@ static struct cpufreq_driver s5pv210_driver = {
 	.init		= s5pv210_cpu_init,
 	.name		= "s5pv210",
 #ifdef CONFIG_PM
-	.suspend	= s5pv210_cpufreq_suspend,
-	.resume		= s5pv210_cpufreq_resume,
+	.suspend	= cpufreq_generic_suspend,
+	.resume		= cpufreq_generic_suspend, /* We need to set SLEEP FREQ again */
 #endif
 };
 
-static struct notifier_block s5pv210_cpufreq_notifier = {
-	.notifier_call = s5pv210_cpufreq_notifier_event,
-};
-
 static struct notifier_block s5pv210_cpufreq_reboot_notifier = {
 	.notifier_call = s5pv210_cpufreq_reboot_notifier_event,
 };
@@ -586,7 +544,6 @@ static int __init s5pv210_cpufreq_init(void)
 		return PTR_ERR(int_regulator);
 	}
 
-	register_pm_notifier(&s5pv210_cpufreq_notifier);
 	register_reboot_notifier(&s5pv210_cpufreq_reboot_notifier);
 
 	return cpufreq_register_driver(&s5pv210_driver);
-- 
1.7.12.rc2.18.g61b472e


  parent reply	other threads:[~2014-02-13  6:51 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-13  6:50 [PATCH V5 0/7] cpufreq: suspend early/resume late: dpm_{suspend|resume}() Viresh Kumar
2014-02-13  6:50 ` [PATCH V5 1/7] cpufreq: suspend governors on system suspend/hibernate Viresh Kumar
2014-02-13  6:50 ` [PATCH V5 2/7] cpufreq: suspend governors from dpm_{suspend|resume}() Viresh Kumar
2014-02-13  6:50 ` [PATCH V5 3/7] cpufreq: call driver's suspend/resume for each policy Viresh Kumar
2014-02-13  6:50 ` [PATCH V5 4/7] cpufreq: Implement cpufreq_generic_suspend() Viresh Kumar
2014-02-13  6:50 ` [PATCH V5 5/7] cpufreq: exynos: Use cpufreq_generic_suspend() Viresh Kumar
2014-02-13  6:50 ` Viresh Kumar [this message]
2014-02-13  6:50 ` [PATCH V5 7/7] cpufreq: Tegra: " Viresh Kumar
2014-02-14 19:42 ` [PATCH V5 0/7] cpufreq: suspend early/resume late: dpm_{suspend|resume}() Stephen Warren
2014-02-14 20:22   ` Stephen Warren
2014-02-17  6:02     ` Viresh Kumar
2014-02-18 20:31       ` Stephen Warren
2014-02-14 22:23   ` Rafael J. Wysocki
2014-02-15  0:03     ` Stephen Warren
2014-02-17  9:20       ` Viresh Kumar
2014-02-18 20:18         ` Stephen Warren
2014-02-19  4:15           ` Viresh Kumar
2014-02-19 17:26             ` Stephen Warren
2014-02-20  1:49               ` Linaro
2014-02-20  1:50                 ` Linaro
2014-02-20 17:40                   ` Stephen Warren
2014-02-24  6:43                     ` Viresh Kumar
2014-02-24 17:17                       ` Stephen Warren
2014-02-17  6:08   ` Viresh Kumar

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=116336822267dca7b3bb0b7581fb03b2dc17d54a.1392273723.git.viresh.kumar@linaro.org \
    --to=viresh.kumar@linaro.org \
    --cc=cpufreq@vger.kernel.org \
    --cc=jhbird.choi@samsung.com \
    --cc=jinchoi@broadcom.com \
    --cc=kgene.kim@samsung.com \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=nm@ti.com \
    --cc=rjw@rjwysocki.net \
    --cc=sebastian.capella@linaro.org \
    --cc=swarren@wwwdotorg.org \
    --cc=tianyu.lan@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.