From patchwork Tue Jul 1 16:32:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 4460611 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AD2569F358 for ; Tue, 1 Jul 2014 16:36:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C11722015A for ; Tue, 1 Jul 2014 16:36:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF8BB203EB for ; Tue, 1 Jul 2014 16:36:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757138AbaGAQfT (ORCPT ); Tue, 1 Jul 2014 12:35:19 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:60636 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758138AbaGAQfP (ORCPT ); Tue, 1 Jul 2014 12:35:15 -0400 Received: by mail-pa0-f50.google.com with SMTP id bj1so10983580pad.9 for ; Tue, 01 Jul 2014 09:35:14 -0700 (PDT) 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=Eo2Yg1mdLGFVoDB3JSLhd5RvN+YEX6WBz3dRqzBGRSE=; b=LVnQStZ6sSn0GYCv2rlK6g9Ayme/R6Ou8Mt23cBiPsxNYLBgG1tgCvcmmf0bMqozCH n2J16Su8cjLa1wd9rlWJR2TmKfWeRQfBmFmRdRrKxeTi4wt4Xcztwz/g6wHbkGg1YiK/ NUg6Ejk+UE87WpWpjfXyx5REKrEDzVjepQGRGTgKXRqn2DWA22/v/VmcfRNHk7B8A/G4 3xtLjH9m8aTYYYO/YNbVmA+Z7seK857blDjJQboCP1h29hkbfMsOR9+VhEMNCRpwtCYQ 9X6oDtRFplRhpGtOAAXhkMCRUTs9OFM9DKJjaETXrtAdO4oLQrXfS56tisHFMlCI3oa3 dPWw== X-Gm-Message-State: ALoCoQmGEoEiZ+4CsKC13jqASR5ESso/bcs/UC+n9vWLkxZ5o1odwJb5xJbT+AAXXRUMY0L/QEeK X-Received: by 10.66.132.3 with SMTP id oq3mr60842430pab.33.1404232514717; Tue, 01 Jul 2014 09:35:14 -0700 (PDT) Received: from localhost ([122.166.172.22]) by mx.google.com with ESMTPSA id i10sm118395867pat.36.2014.07.01.09.35.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 01 Jul 2014 09:35:14 -0700 (PDT) From: Viresh Kumar To: rjw@rjwysocki.net, shawn.guo@linaro.org Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, arvind.chauhan@arm.com, sboyd@codeaurora.org, linux-arm-msm@vger.kernel.org, spk.linux@gmail.com, thomas.ab@samsung.com, nm@ti.com, t.figa@samsung.com, Viresh Kumar Subject: [PATCH 11/14] cpufreq: cpu0: Make allocate_resources() work for any CPU Date: Tue, 1 Jul 2014 22:02:40 +0530 Message-Id: X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: References: In-Reply-To: References: Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently allocate_resources() supports only CPU0 and it would need to allocate resources for any CPU going forward. Add another argument to it, i.e. cpu, and update code accordingly. Signed-off-by: Viresh Kumar --- drivers/cpufreq/cpufreq-cpu0.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index 17001a8..44633f6 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c @@ -106,7 +106,7 @@ static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index) return ret; } -static int allocate_resources(struct device **cdev, +static int allocate_resources(int cpu, struct device **cdev, struct regulator **creg, struct clk **cclk) { struct device *cpu_dev; @@ -115,24 +115,28 @@ static int allocate_resources(struct device **cdev, int ret = 0; char *reg_cpu0 = "cpu0", *reg_cpu = "cpu", *reg; - cpu_dev = get_cpu_device(0); + cpu_dev = get_cpu_device(cpu); if (!cpu_dev) { - pr_err("failed to get cpu0 device\n"); + pr_err("failed to get cpu%d device\n", cpu); return -ENODEV; } /* Try "cpu0" for older DTs */ - reg = reg_cpu0; + if (!cpu) + reg = reg_cpu0; + else + reg = reg_cpu; try_again: cpu_reg = regulator_get_optional(cpu_dev, reg); if (IS_ERR(cpu_reg)) { /* - * If cpu0 regulator supply node is present, but regulator is + * If cpu's regulator supply node is present, but regulator is * not yet registered, we should try defering probe. */ if (PTR_ERR(cpu_reg) == -EPROBE_DEFER) { - dev_err(cpu_dev, "cpu0 regulator not ready, retry\n"); + dev_err(cpu_dev, "cpu%d regulator not ready, retry\n", + cpu); return -EPROBE_DEFER; } @@ -142,8 +146,8 @@ try_again: goto try_again; } - dev_warn(cpu_dev, "failed to get cpu0 regulator: %ld\n", - PTR_ERR(cpu_reg)); + dev_warn(cpu_dev, "failed to get cpu%d regulator: %ld\n", + cpu, PTR_ERR(cpu_reg)); } cpu_clk = clk_get(cpu_dev, NULL); @@ -157,11 +161,12 @@ try_again: * registered, we should try defering probe. */ if (PTR_ERR(cpu_clk) == -EPROBE_DEFER) { - dev_err(cpu_dev, "cpu0 clock not ready, retry\n"); + dev_err(cpu_dev, "cpu%d clock not ready, retry\n", cpu); ret = -EPROBE_DEFER; } else { ret = PTR_ERR(cpu_clk); - dev_err(cpu_dev, "failed to get cpu0 clock: %d\n", ret); + dev_err(cpu_dev, "failed to get cpu%d clock: %d\n", ret, + cpu); } } else { *cdev = cpu_dev; @@ -184,8 +189,7 @@ static int cpu0_cpufreq_init(struct cpufreq_policy *policy) unsigned int transition_latency; int ret; - /* We only support cpu0 currently */ - ret = allocate_resources(&cpu_dev, &cpu_reg, &cpu_clk); + ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk); if (ret) { pr_err("%s: Failed to allocate resources\n: %d", __func__, ret); return ret; @@ -322,7 +326,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) * * FIXME: Is checking this only for CPU0 sufficient ? */ - ret = allocate_resources(&cpu_dev, &cpu_reg, &cpu_clk); + ret = allocate_resources(0, &cpu_dev, &cpu_reg, &cpu_clk); if (ret) return ret;