From patchwork Mon Feb 17 09:25:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 24753 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A9348202B2 for ; Mon, 17 Feb 2014 09:26:31 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id gq1sf57928477obb.8 for ; Mon, 17 Feb 2014 01:26:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=/cCseTYIn+vAIn5UX9XkeERhlvpWuDoRzsJlVzieHKY=; b=Ey2rLsZ5JJ8yAkNOujItPI3ze4Xy+RhQLsAoJvW7UYS7oYc7yJg3cZCYryf8I7QkzV ULnHL0PtsiuihmW3WSkpQRfJzETwADkVSBVoe23cUDdiAFl95hWxB6cSGk2zRNH4tNgr IHiKcFUEV5m8FRqdlFEHmwXVbo67H0Kt58avLTM+xiiGRmPDoaSMXCjEpFaxmtNSIE18 C537iRm/Dr16YIc+PzZZYnqCBuFIGOXkjxB5lp6WfNCX5OnGhJTQf5hwVm1N1X/nhrYh 3l0cExs96X8fA5vBhl2Xbnj0MsF9hEnxTY5ZZSKIGZuUqAyhvGGKEZ3McqEy5k5zRI2x c3LA== X-Gm-Message-State: ALoCoQn7e+PFavZlLBBQ9U0QtzDCMufxR63wuhgNSXcunS1F8siKt44/1jRetwHtzRJDwnj5Jv4Q X-Received: by 10.50.88.100 with SMTP id bf4mr8149339igb.1.1392629190772; Mon, 17 Feb 2014 01:26:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.135 with SMTP id j7ls801907qgf.88.gmail; Mon, 17 Feb 2014 01:26:30 -0800 (PST) X-Received: by 10.52.27.9 with SMTP id p9mr10214611vdg.28.1392629190672; Mon, 17 Feb 2014 01:26:30 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id y3si4334050vdo.110.2014.02.17.01.26.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 01:26:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id le5so11677841vcb.30 for ; Mon, 17 Feb 2014 01:26:30 -0800 (PST) X-Received: by 10.220.2.199 with SMTP id 7mr16331986vck.4.1392629190590; Mon, 17 Feb 2014 01:26:30 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp123667vcz; Mon, 17 Feb 2014 01:26:30 -0800 (PST) X-Received: by 10.67.3.40 with SMTP id bt8mr25090109pad.78.1392629189764; Mon, 17 Feb 2014 01:26:29 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pp3si13164835pbb.289.2014.02.17.01.26.29; Mon, 17 Feb 2014 01:26:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753002AbaBQJ0N (ORCPT + 27 others); Mon, 17 Feb 2014 04:26:13 -0500 Received: from mail-wg0-f48.google.com ([74.125.82.48]:51173 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752939AbaBQJ0D (ORCPT ); Mon, 17 Feb 2014 04:26:03 -0500 Received: by mail-wg0-f48.google.com with SMTP id a1so2002342wgh.3 for ; Mon, 17 Feb 2014 01:26:01 -0800 (PST) X-Received: by 10.194.174.234 with SMTP id bv10mr552089wjc.66.1392629161381; Mon, 17 Feb 2014 01:26:01 -0800 (PST) Received: from localhost ([213.122.173.131]) by mx.google.com with ESMTPSA id ju6sm35230768wjc.1.2014.02.17.01.25.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 17 Feb 2014 01:26:00 -0800 (PST) From: Viresh Kumar 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 Subject: [PATCH V6 6/7] cpufreq: s5pv210: Use cpufreq_generic_suspend() Date: Mon, 17 Feb 2014 14:55:12 +0530 Message-Id: X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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 #include #include -#include #include #include @@ -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);