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 S1756787AbbLASoW (ORCPT <rfc822;w@1wt.eu>);
	Tue, 1 Dec 2015 13:44:22 -0500
Received: from devils.ext.ti.com ([198.47.26.153]:50049 "EHLO
	devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755932AbbLASoU (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 1 Dec 2015 13:44:20 -0500
From: "Andrew F. Davis" <afd@ti.com>
To: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Ian Campbell <ijc+devicetree@hellion.org.uk>,
        Kumar Gala <galak@codeaurora.org>,
        Linus Walleij <linus.walleij@linaro.org>,
        Alexandre Courbot <gnurou@gmail.com>,
        Samuel Ortiz <sameo@linux.intel.com>, Lee Jones <lee.jones@linaro.org>,
        Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
CC: <devicetree@vger.kernel.org>, <linux-gpio@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, "Andrew F. Davis" <afd@ti.com>
Subject: [PATCH v5 3/4] regulator: tps65086: Update regulator driver for the TPS65086 PMIC
Date: Tue, 1 Dec 2015 12:44:03 -0600
Message-ID: <1448995444-29031-4-git-send-email-afd@ti.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1448995444-29031-1-git-send-email-afd@ti.com>
References: <1448995444-29031-1-git-send-email-afd@ti.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Make changes to allow this driver to work with the updated TPS65086 core
driver and bindings.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 drivers/regulator/tps65086-regulator.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c
index c26fc7e..33f389d 100644
--- a/drivers/regulator/tps65086-regulator.c
+++ b/drivers/regulator/tps65086-regulator.c
@@ -16,10 +16,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
-#include <linux/regulator/of_regulator.h>
 
 #include <linux/mfd/tps65086.h>
 
@@ -31,6 +30,7 @@ enum tps65086_regulators { BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, LDOA1,
 		.desc = {						\
 			.name			= _name,		\
 			.of_match		= of_match_ptr(_of),	\
+			.regulators_node	= "regulators",		\
 			.of_parse_cb		= tps65086_of_parse_cb,	\
 			.id			= _id,			\
 			.ops			= &reg_ops,		\
@@ -54,6 +54,7 @@ enum tps65086_regulators { BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, LDOA1,
 		.desc = {						\
 			.name			= _name,		\
 			.of_match		= of_match_ptr(_of),	\
+			.regulators_node	= "regulators",		\
 			.of_parse_cb		= tps65086_of_parse_cb,	\
 			.id			= _id,			\
 			.ops			= &switch_ops,		\
@@ -213,8 +214,8 @@ static int tps65086_regulator_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, tps);
 
 	config.dev = &pdev->dev;
+	config.dev->of_node = tps->dev->of_node;
 	config.driver_data = tps;
-	config.of_node = pdev->dev.of_node;
 	config.regmap = tps->regmap;
 
 	for (i = 0; i < ARRAY_SIZE(regulators); i++) {
-- 
1.9.1