From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752627AbbLQSGF (ORCPT <rfc822;w@1wt.eu>);
	Thu, 17 Dec 2015 13:06:05 -0500
Received: from mailout1.samsung.com ([203.254.224.24]:44394 "EHLO
	mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751219AbbLQSGD (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 17 Dec 2015 13:06:03 -0500
X-AuditID: cbfee61b-f793c6d00000236c-33-5672f988c15a
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
To: Viresh Kumar <viresh.kumar@linaro.org>, Lee Jones <lee.jones@linaro.org>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>, nm@ti.com,
        linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Dmitry Torokhov <dtor@chromium.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Len Brown <len.brown@intel.com>,
        open list <linux-kernel@vger.kernel.org>, Pavel Machek <pavel@ucw.cz>,
        Shawn Guo <shawnguo@kernel.org>, linux-samsung-soc@vger.kernel.org
Subject: [PATCH v2] PM / OPP: Fix parsing of opp-microvolt and opp-microamp
 properties
Date: Thu, 17 Dec 2015 19:04:38 +0100
Message-id: <1471955.ORlHo2b56O@amdc1976>
User-Agent: KMail/4.13.3 (Linux/3.13.0-63-generic; KDE/4.13.3; x86_64; ; )
MIME-version: 1.0
Content-transfer-encoding: 7Bit
Content-type: text/plain; charset=us-ascii
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e+xgG7Hz6Iwg+O3jCw2zljPajGzaTur
	RfPi9WwW978eZbSYNWUvk8X7Q8+YLS7vmsNm8bn3CKPFjPP7mCze/DjLZHH31FE2i8cr3rJb
	/DjTzWLxYou4xcavHg78HrMbLrJ4XO7rZfJYvOclk8emVZ1sHneu7WHz2D93DbvH7X+PmT36
	tqxi9Dh+YzuTx4rV39k9Pm+SC+CO4rJJSc3JLEst0rdL4MrY2fOMtWAaT8WaPweYGhgncnUx
	cnJICJhIPHmyghnCFpO4cG89WxcjF4eQwFJGie2f7zGBJIQEvjJK9PyKArHZBKwkJravYgQp
	EhFoYJSYunM9E4jDLLCJWeLdrttgo4QFIiSuzm9mBLFZBFQlthzYzA5i8wpoSvz9dpIFxBYV
	8JJ4/3MuM0RcUOLH5HtgcWYBeYl9+6eyQthaEut3HmeawMg3C0nZLCRls5CULWBkXsUokVqQ
	XFCclJ5rlJdarlecmFtcmpeul5yfu4kRHEfPpHcwHt7lfohRgINRiYdXYF9hmBBrYllxZe4h
	RgkOZiURXvvXRWFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEefddigwTEkhPLEnNTk0tSC2CyTJx
	cEo1MPbXc/ublh62jYleeiFyjrd10uWAlPqKgHpHaeWSmJIQyWl/bK9OcDpyWz3y0rnEl2VF
	zTOVvjdxfKpT0xM5Xn0jNPDG6k+bp2xd4rQods5iftHo/qMJj5yOGmZunqwbXCCk8H69+trr
	piVC9cab7vdZsTas5vlg9DPkwrVlfzqOSqhdVhK+rcRSnJFoqMVcVJwIAH0ckC6fAgAA
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 !prop cases.

Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Fixes: 01fb4d3c39d3 ("PM / OPP: Parse 'opp-<prop>-<name> 'bindings")
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
v2:
- rework the changes as requested by Viresh

This fixes Exynos4x12 cpufreq-dt suppport regression present in
linux-pm/linux-next tree.  Rafael, please apply.  Thank you.

 drivers/base/power/opp/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/drivers/base/power/opp/core.c
===================================================================
--- a/drivers/base/power/opp/core.c	2015-12-17 18:57:27.358981831 +0100
+++ b/drivers/base/power/opp/core.c	2015-12-17 18:58:04.550982529 +0100
@@ -814,7 +814,7 @@ static int opp_parse_supplies(struct dev
 
 	if (!prop) {
 		/* Search for "opp-microvolt" */
-		name[13] = '\0';
+		sprintf(name, "opp-microvolt");
 		prop = of_find_property(opp->np, name, NULL);
 
 		/* Missing property isn't a problem, but an invalid entry is */
@@ -855,7 +855,7 @@ static int opp_parse_supplies(struct dev
 
 	if (!prop) {
 		/* Search for "opp-microamp" */
-		name[12] = '\0';
+		sprintf(name, "opp-microamp");
 		prop = of_find_property(opp->np, name, NULL);
 	}