From patchwork Thu Jan 28 08:20:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 60683 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp331895lbb; Thu, 28 Jan 2016 00:22:39 -0800 (PST) X-Received: by 10.98.75.4 with SMTP id y4mr2745157pfa.32.1453969358932; Thu, 28 Jan 2016 00:22:38 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n1si15316608pap.199.2016.01.28.00.22.38; Thu, 28 Jan 2016 00:22:38 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965907AbcA1IWh (ORCPT + 30 others); Thu, 28 Jan 2016 03:22:37 -0500 Received: from mail-pf0-f180.google.com ([209.85.192.180]:34020 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965596AbcA1IVh (ORCPT ); Thu, 28 Jan 2016 03:21:37 -0500 Received: by mail-pf0-f180.google.com with SMTP id o185so15204562pfb.1 for ; Thu, 28 Jan 2016 00:21:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=xfW/R7VpxWXr4oDvIiXZ8EQBThlxcCX8dmotMYf0+yo=; b=R6vPfTiuzW7fGOu5XKnJvl5FLdoUZUw8ijvPsGyPHXPEOZknH+nBxyARHZpccRJ+ff sejR/+wkLFdDnvRlhCBryKV4S+4cxgd0C31ozvWTP0/hWQolI1fm75PN9MXuJyAzcf8c WFad7TbR9dG52cXYixgEfkvjY9+uMarqfj2t4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=xfW/R7VpxWXr4oDvIiXZ8EQBThlxcCX8dmotMYf0+yo=; b=d33MDU0pBSAKKBR6P56l7bbuAZwrZP5gsi7LGQYokZhwIP8kdIFDyh17Jp0R6MG3bm njIyVqt6TGhcZ2T/Gn3LsG8khSI8TJ67UmcApaTw3nwOZZKVoQXh1hX6LgEtaejw7GPz ozdFKQmiT6heuZdreK+oZiGz2w++B7TdMsS2b3UxYqsA8h2r4i7kWJeFGogrGnr8c6jd w+GG++9WUjioq+9EAnTkMTbdX4wM8W50KSHjNn+xtnCr+23S7UsUGBN2l0fJmfo0fIRz hgy10IihKmJSpYsILqIPTV7V2+8xxRUymM/m6ZTe6L2c+Mx/77rLumEJRgo5PvV0ru1M EeEA== X-Gm-Message-State: AG10YOSGeo9NgA4Go7upJvLUcqJzBuZWpmqzL/o1JmmxCa1O0nsq0DcyLPgP6z2nTGm5rP/P X-Received: by 10.98.18.8 with SMTP id a8mr2669200pfj.41.1453969296739; Thu, 28 Jan 2016 00:21:36 -0800 (PST) Received: from localhost ([122.171.121.234]) by smtp.gmail.com with ESMTPSA id n27sm14201844pfb.53.2016.01.28.00.21.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jan 2016 00:21:36 -0800 (PST) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, Stephen Boyd , nm@ti.com, Viresh Kumar , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 14/16] cpufreq: dt: Use dev_pm_opp_set_rate() to switch frequency Date: Thu, 28 Jan 2016 13:50:43 +0530 Message-Id: <0aea45d1102903282f53f2b01189d83c6b371628.1453965717.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.7.0.79.gdc08a19 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org OPP core supports frequency/voltage changes based on the target frequency now, use that instead of open coding the same in cpufreq-dt driver. Signed-off-by: Viresh Kumar Reviewed-by: Stephen Boyd --- drivers/cpufreq/cpufreq-dt.c | 73 ++------------------------------------------ 1 file changed, 2 insertions(+), 71 deletions(-) -- 2.7.0.79.gdc08a19 diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index 214612c473d4..13338365f24e 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -45,79 +45,10 @@ static struct freq_attr *cpufreq_dt_attr[] = { static int set_target(struct cpufreq_policy *policy, unsigned int index) { - struct dev_pm_opp *opp; - struct cpufreq_frequency_table *freq_table = policy->freq_table; - struct clk *cpu_clk = policy->clk; struct private_data *priv = policy->driver_data; - struct device *cpu_dev = priv->cpu_dev; - struct regulator *cpu_reg = priv->cpu_reg; - unsigned long volt = 0, tol = 0; - int volt_old = 0; - unsigned int old_freq, new_freq; - long freq_Hz, freq_exact; - int ret; - - freq_Hz = clk_round_rate(cpu_clk, freq_table[index].frequency * 1000); - if (freq_Hz <= 0) - freq_Hz = freq_table[index].frequency * 1000; - - freq_exact = freq_Hz; - new_freq = freq_Hz / 1000; - old_freq = clk_get_rate(cpu_clk) / 1000; - - if (!IS_ERR(cpu_reg)) { - unsigned long opp_freq; - - rcu_read_lock(); - opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_Hz); - if (IS_ERR(opp)) { - rcu_read_unlock(); - dev_err(cpu_dev, "failed to find OPP for %ld\n", - freq_Hz); - return PTR_ERR(opp); - } - volt = dev_pm_opp_get_voltage(opp); - opp_freq = dev_pm_opp_get_freq(opp); - rcu_read_unlock(); - tol = volt * priv->voltage_tolerance / 100; - volt_old = regulator_get_voltage(cpu_reg); - dev_dbg(cpu_dev, "Found OPP: %ld kHz, %ld uV\n", - opp_freq / 1000, volt); - } - - dev_dbg(cpu_dev, "%u MHz, %d mV --> %u MHz, %ld mV\n", - old_freq / 1000, (volt_old > 0) ? volt_old / 1000 : -1, - new_freq / 1000, volt ? volt / 1000 : -1); - - /* scaling up? scale voltage before frequency */ - if (!IS_ERR(cpu_reg) && new_freq > old_freq) { - ret = regulator_set_voltage_tol(cpu_reg, volt, tol); - if (ret) { - dev_err(cpu_dev, "failed to scale voltage up: %d\n", - ret); - return ret; - } - } - - ret = clk_set_rate(cpu_clk, freq_exact); - if (ret) { - dev_err(cpu_dev, "failed to set clock rate: %d\n", ret); - if (!IS_ERR(cpu_reg) && volt_old > 0) - regulator_set_voltage_tol(cpu_reg, volt_old, tol); - return ret; - } - /* scaling down? scale voltage after frequency */ - if (!IS_ERR(cpu_reg) && new_freq < old_freq) { - ret = regulator_set_voltage_tol(cpu_reg, volt, tol); - if (ret) { - dev_err(cpu_dev, "failed to scale voltage down: %d\n", - ret); - clk_set_rate(cpu_clk, old_freq * 1000); - } - } - - return ret; + return dev_pm_opp_set_rate(priv->cpu_dev, + policy->freq_table[index].frequency * 1000); } /*