From patchwork Fri Sep 11 12:02:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 7160101 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 15B389F665 for ; Fri, 11 Sep 2015 12:03:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E64320849 for ; Fri, 11 Sep 2015 12:02:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A347207BD for ; Fri, 11 Sep 2015 12:02:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753048AbbIKMCy (ORCPT ); Fri, 11 Sep 2015 08:02:54 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:34462 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752793AbbIKMCw (ORCPT ); Fri, 11 Sep 2015 08:02:52 -0400 Received: by padhy16 with SMTP id hy16so73623386pad.1 for ; Fri, 11 Sep 2015 05:02:52 -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=KTDd1OQ14O384iz9T9ktyrCbzRqSRhXNBJqkAM0IKRY=; b=XK2yFLc+nKeq3TuweOJKO/Q6zXX+XgB4Ye01yHJwTB6L5lyWdfTtzJ1X/9Tpb7af9A l7huCdlHXl1kELRU5zn3nvFok7WoMZtXf2BHMt+z8uSTPOqWQ7V4gj3KFvM0ybNLG62O 85RL0urmvKmcVTfyi/h2Q+TSYiEUxs/Xmva8exlqQanR1BYgUcRlXdcMYKaARhiRy5Lo eiHKBqUzjFy//WS5fDS/ncJ553lTNO0xmiRgi2udDLd2xEvqqZkLGkRRxcCMQBhn1CrP dON7UtUGI8vY3jULm6Pu3rVrV3gWdIUijYvIT9VVf4GnZEjgCrpnrGOXGynWUo9yKnLf oW5A== X-Gm-Message-State: ALoCoQmaSLjB7sSDf1iqm8NLUp5td6r7eKFbz0+1UntPN9SCeUg0ZlKL8Cx89ffxP130oiyWm+Qp X-Received: by 10.68.139.226 with SMTP id rb2mr95826663pbb.49.1441972971735; Fri, 11 Sep 2015 05:02:51 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id pi9sm2358pbb.96.2015.09.11.05.02.50 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 11 Sep 2015 05:02:51 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , nm@ti.com, sboyd@codeaurora.org Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, rob.herring@linaro.org, lee.jones@linaro.org, Viresh Kumar , Bartlomiej Zolnierkiewicz , Dmitry Torokhov , Greg Kroah-Hartman , Len Brown , linux-kernel@vger.kernel.org (open list), Pavel Machek Subject: [PATCH 05/16] PM / OPP: Parse all power-supply related bindings together Date: Fri, 11 Sep 2015 17:32:01 +0530 Message-Id: <6269be0aac00ae0d1549db9be93472b951636ef6.1441972771.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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 Move all DT parsing for the power supplies to a single function, rather than keeping them at separate places. This will help manage things properly. Signed-off-by: Viresh Kumar --- drivers/base/power/opp/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index 6bebc503d727..463417b6838c 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -787,9 +787,10 @@ static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, } /* TODO: Support multiple regulators */ -static int opp_get_microvolt(struct dev_pm_opp *opp, struct device *dev) +static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev) { u32 microvolt[3] = {0}; + u32 val; int count, ret; count = of_property_count_u32_elems(opp->np, "opp-microvolt"); @@ -815,6 +816,9 @@ static int opp_get_microvolt(struct dev_pm_opp *opp, struct device *dev) opp->u_volt_min = microvolt[1]; opp->u_volt_max = microvolt[2]; + if (!of_property_read_u32(opp->np, "opp-microamp", &val)) + opp->u_amp = val; + return 0; } @@ -879,13 +883,10 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np) if (!of_property_read_u32(np, "clock-latency-ns", &val)) new_opp->clock_latency_ns = val; - ret = opp_get_microvolt(new_opp, dev); + ret = opp_parse_supplies(new_opp, dev); if (ret) goto free_opp; - if (!of_property_read_u32(new_opp->np, "opp-microamp", &val)) - new_opp->u_amp = val; - ret = _opp_add(dev, new_opp, dev_opp); if (ret) goto free_opp;