[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-id: <18360458.m71vGHrTb9@amdc1976>
Date: Wed, 16 Dec 2015 16:41:40 +0100
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>
To: Viresh Kumar <viresh.kumar@...aro.org>,
Lee Jones <lee.jones@...aro.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Cc: Stephen Boyd <sboyd@...eaurora.org>, nm@...com,
linaro-kernel@...ts.linaro.org, linux-pm@...r.kernel.org,
Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>,
Dmitry Torokhov <dtor@...omium.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Len Brown <len.brown@...el.com>,
open list <linux-kernel@...r.kernel.org>,
Pavel Machek <pavel@....cz>, Shawn Guo <shawnguo@...nel.org>,
linux-samsung-soc@...r.kernel.org
Subject: [PATCH] PM / OPP: Fix parsing of opp-microvolt and opp-microamp
properties
Commit 01fb4d3c39d3 ("PM / OPP: Parse 'opp-<prop>-<name>'
bindings") broke support for parsing standard opp-microvolt and
opp-microamp properties. Fix it by setting 'name' string to
proper value for !dev_opp->prop_name cases.
Cc: Viresh Kumar <viresh.kumar@...aro.org>
Cc: Lee Jones <lee.jones@...aro.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Fixes: 01fb4d3c39d3 ("PM / OPP: Parse 'opp-<prop>-<name> 'bindings")
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>
---
This fixes Exynos4x12 cpufreq-dt support regression present in
linux-pm/linux-next tree. Rafael, please apply. Thank you.
drivers/base/power/opp/core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: b/drivers/base/power/opp/core.c
===================================================================
--- a/drivers/base/power/opp/core.c 2015-12-16 16:10:13.509171420 +0100
+++ b/drivers/base/power/opp/core.c 2015-12-16 16:21:18.385183902 +0100
@@ -806,11 +806,11 @@ static int opp_parse_supplies(struct dev
struct property *prop = NULL;
char name[NAME_MAX];
+ sprintf(name, "opp-microvolt-%s", dev_opp->prop_name);
+
/* Search for "opp-microvolt-<name>" */
- if (dev_opp->prop_name) {
- sprintf(name, "opp-microvolt-%s", dev_opp->prop_name);
+ if (dev_opp->prop_name)
prop = of_find_property(opp->np, name, NULL);
- }
if (!prop) {
/* Search for "opp-microvolt" */
@@ -848,10 +848,10 @@ static int opp_parse_supplies(struct dev
/* Search for "opp-microamp-<name>" */
prop = NULL;
- if (dev_opp->prop_name) {
- sprintf(name, "opp-microamp-%s", dev_opp->prop_name);
+ sprintf(name, "opp-microamp-%s", dev_opp->prop_name);
+
+ if (dev_opp->prop_name)
prop = of_find_property(opp->np, name, NULL);
- }
if (!prop) {
/* Search for "opp-microamp" */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists