From: Sven Van Asbroeck <thesven73@gmail.com>
To: Lee Jones <lee.jones@linaro.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Pavel Machek <pavel@ucw.cz>, Rob Herring <robh+dt@kernel.org>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Grigoryev Denis <grigoryev@fastwel.ru>,
Axel Lin <axel.lin@ingics.com>, Dan Murphy <dmurphy@ti.com>,
Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-leds@vger.kernel.org
Subject: [PATCH v1 2/4] regulator: tps6105x: add optional devicetree support
Date: Mon, 18 Nov 2019 11:53:58 -0500 [thread overview]
Message-ID: <20191118165400.21985-3-TheSven73@gmail.com> (raw)
In-Reply-To: <20191118165400.21985-1-TheSven73@gmail.com>
If regulator init data is not specified in the parent mfd
device's platform data, attempt to retrieve it from the
devicetree node.
Example:
i2c0 {
tps61052@33 {
compatible = "ti,tps61052";
reg = <0x33>;
regulator {
compatible = "ti,tps6105x-regulator";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
};
};
Tree: next-20191118
Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
---
drivers/regulator/tps6105x-regulator.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index 06059a94f7c6..9bc4e869fc4c 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -18,6 +18,7 @@
#include <linux/regulator/driver.h>
#include <linux/mfd/core.h>
#include <linux/mfd/tps6105x.h>
+#include <linux/regulator/of_regulator.h>
static const unsigned int tps6105x_voltages[] = {
4500000,
@@ -58,6 +59,7 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
{
struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
struct tps6105x_platform_data *pdata = tps6105x->pdata;
+ struct regulator_init_data *init_data = pdata->regulator_data;
struct regulator_config config = { };
int ret;
@@ -68,8 +70,14 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
return 0;
}
+ if (!init_data)
+ init_data = of_get_regulator_init_data(
+ &pdev->dev, pdev->dev.of_node,
+ &tps6105x_regulator_desc);
+ if (!init_data)
+ return -EINVAL;
config.dev = &tps6105x->client->dev;
- config.init_data = pdata->regulator_data;
+ config.init_data = init_data;
config.driver_data = tps6105x;
config.regmap = tps6105x->regmap;
--
2.17.1
next prev parent reply other threads:[~2019-11-18 16:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 16:53 [PATCH v1 0/4] tps6105x add devicetree and leds support Sven Van Asbroeck
2019-11-18 16:53 ` [PATCH v1 1/4] tps6105x: add optional devicetree support Sven Van Asbroeck
2019-11-18 17:01 ` Mark Brown
2019-11-18 17:17 ` Sven Van Asbroeck
2019-11-18 17:45 ` Mark Brown
2019-11-18 18:13 ` Sven Van Asbroeck
2019-11-18 20:34 ` Mark Brown
2019-11-18 21:17 ` Sven Van Asbroeck
2019-11-18 16:53 ` Sven Van Asbroeck [this message]
2019-11-18 16:53 ` [PATCH v1 3/4] leds: tps6105x: add driver for mfd chip led mode Sven Van Asbroeck
2019-11-18 16:54 ` [PATCH v1 4/4] dt-bindings: mfd: update TI tps6105x chip bindings Sven Van Asbroeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191118165400.21985-3-TheSven73@gmail.com \
--to=thesven73@gmail.com \
--cc=axel.lin@ingics.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmurphy@ti.com \
--cc=grigoryev@fastwel.ru \
--cc=jacek.anaszewski@gmail.com \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pavel@ucw.cz \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).