From patchwork Thu Oct 15 16:12:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 7407881 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 285729F4DC for ; Thu, 15 Oct 2015 16:14:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3AE3B20828 for ; Thu, 15 Oct 2015 16:14:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53EA6207C7 for ; Thu, 15 Oct 2015 16:14:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753841AbbJOQNc (ORCPT ); Thu, 15 Oct 2015 12:13:32 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35927 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753656AbbJOQNa (ORCPT ); Thu, 15 Oct 2015 12:13:30 -0400 Received: by padcn9 with SMTP id cn9so10259955pad.3 for ; Thu, 15 Oct 2015 09:13:29 -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=1BnENkJKsDdj+uE2sbSsAoTtUNwWDCkqUuTtvPe1w3I=; b=WBoCbPS9InExuwihNe+J/YQ4MMX5o/aGH45f8/jbnHIBesZF414nNpTn4uelwKyeTR KEkflUj1fIvVQamUwmynBLLcP3rx9GD6iFWI+aT1GFDp5aI51xnc2glpIGcLhqIj/KLu 7R5vXKCh+RGZhTlmt6bHajDXIcllg6wrC1niN7pkAB37MrH4nyZI3iOpxlYehnfKVyMy LZvD/ePaj/aWYocURBkwIneBT/+n6yXBfXRrKU6kdp9thisLRSg5cx08nkAnbCIKzfZx ZAPvNWM6DLX8pnJahiR5RGNn6yifMXoKXOZIwkT3jvdjx9jXhRPAGj/ynEbZ5rxR83QN /e9w== X-Gm-Message-State: ALoCoQlWwZPO9rwenBbzkRTYHjR+ZKWC4QlMvBCLoFNMV7jcXFodQg3Hbqa8Tcxfg08KcAWt4bp1 X-Received: by 10.68.181.34 with SMTP id dt2mr10780971pbc.7.1444925609520; Thu, 15 Oct 2015 09:13:29 -0700 (PDT) Received: from localhost ([223.227.130.246]) by smtp.gmail.com with ESMTPSA id iu2sm13863292pbd.16.2015.10.15.09.13.27 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 15 Oct 2015 09:13:29 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, sboyd@codeaurora.org, nm@ti.com, Viresh Kumar , Bartlomiej Zolnierkiewicz , Dmitry Torokhov , Greg Kroah-Hartman , Len Brown , linux-kernel@vger.kernel.org (open list), Pavel Machek Subject: [PATCH V2 3/4] PM / OPP: Parse all power-supply related bindings together Date: Thu, 15 Oct 2015 21:42:45 +0530 Message-Id: <10b3f112bb2863098a0ab21bcb9e951f0a8da51c.1444925400.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=ham 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 Reviewed-by: Stephen Boyd --- 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 63b0f57601b8..8fa522f41226 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -772,9 +772,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; /* Missing property isn't a problem, but an invalid entry is */ @@ -807,6 +808,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; } @@ -871,13 +875,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;