Unverified Commit 587bfe3f authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Mark Brown
Browse files

regulator: bd9576: switch to using devm_fwnode_gpiod_get() 



I would like to stop exporting OF-specific devm_gpiod_get_from_of_node()
so that gpiolib can be cleaned a bit, so let's switch to the generic
fwnode property API.

While at it switch the rest of the calls to read properties in
bd957x_probe() to the generic device property API as well.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/20220903-gpiod_get_from_of_node-remove-v1-9-b29adfb27a6c@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 97c9278e

drivers/regulator/bd9576-regulator.c

+9 −8
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/of_regulator.h>
@@ -939,7 +940,7 @@ static int bd957x_probe(struct platform_device *pdev) 
	}



	ic_data->regmap = regmap;

	vout_mode = of_property_read_bool(pdev->dev.parent->of_node,

	vout_mode = device_property_read_bool(pdev->dev.parent,

					      "rohm,vout1-en-low");

	if (vout_mode) {

		struct gpio_desc *en;
@@ -948,10 +949,10 @@ static int bd957x_probe(struct platform_device *pdev) 


		/* VOUT1 enable state judged by VOUT1_EN pin */

		/* See if we have GPIO defined */

		en = devm_gpiod_get_from_of_node(&pdev->dev,

						 pdev->dev.parent->of_node,

						 "rohm,vout1-en-gpios", 0,

						 GPIOD_OUT_LOW, "vout1-en");

		en = devm_fwnode_gpiod_get(&pdev->dev,

					   dev_fwnode(pdev->dev.parent),

					   "rohm,vout1-en", GPIOD_OUT_LOW,

					   "vout1-en");

		if (!IS_ERR(en)) {

			/* VOUT1_OPS gpio ctrl */

			/*
@@ -986,7 +987,7 @@ static int bd957x_probe(struct platform_device *pdev) 
	 * like DDR voltage selection.

	 */

	platform_set_drvdata(pdev, ic_data);

	ddr_sel =  of_property_read_bool(pdev->dev.parent->of_node,

	ddr_sel = device_property_read_bool(pdev->dev.parent,

					    "rohm,ddr-sel-low");

	if (ddr_sel)

		ic_data->regulator_data[2].desc.fixed_uV = 1350000;