From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: Heiko Stuebner <heiko@sntech.de>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Lee Jones <lee@kernel.org>
Cc: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Alessandro Zummo <a.zummo@towertech.it>,
linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Sebastian Reichel <sebastian.reichel@collabora.com>,
kernel@collabora.com
Subject: [PATCH v8 12/14] regulator: rk808: cleanup parent device usage
Date: Thu, 4 May 2023 19:36:16 +0200 [thread overview]
Message-ID: <20230504173618.142075-13-sebastian.reichel@collabora.com> (raw)
In-Reply-To: <20230504173618.142075-1-sebastian.reichel@collabora.com>
By overridering the device's of_node a bit earlier we can
get the GPIOs and any other DT properties from our own
device instead of relying on the parent device.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
drivers/regulator/rk808-regulator.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
index 80ba782d8923..71a1ca8b917e 100644
--- a/drivers/regulator/rk808-regulator.c
+++ b/drivers/regulator/rk808-regulator.c
@@ -1245,20 +1245,19 @@ static const struct regulator_desc rk818_reg[] = {
};
static int rk808_regulator_dt_parse_pdata(struct device *dev,
- struct device *client_dev,
struct regmap *map,
struct rk808_regulator_data *pdata)
{
struct device_node *np;
int tmp, ret = 0, i;
- np = of_get_child_by_name(client_dev->of_node, "regulators");
+ np = of_get_child_by_name(dev->of_node, "regulators");
if (!np)
return -ENXIO;
for (i = 0; i < ARRAY_SIZE(pdata->dvs_gpio); i++) {
pdata->dvs_gpio[i] =
- devm_gpiod_get_index_optional(client_dev, "dvs", i,
+ devm_gpiod_get_index_optional(dev, "dvs", i,
GPIOD_OUT_LOW);
if (IS_ERR(pdata->dvs_gpio[i])) {
ret = PTR_ERR(pdata->dvs_gpio[i]);
@@ -1292,6 +1291,9 @@ static int rk808_regulator_probe(struct platform_device *pdev)
struct regmap *regmap;
int ret, i, nregulators;
+ pdev->dev.of_node = pdev->dev.parent->of_node;
+ pdev->dev.of_node_reused = true;
+
regmap = dev_get_regmap(pdev->dev.parent, NULL);
if (!regmap)
return -ENODEV;
@@ -1300,8 +1302,7 @@ static int rk808_regulator_probe(struct platform_device *pdev)
if (!pdata)
return -ENOMEM;
- ret = rk808_regulator_dt_parse_pdata(&pdev->dev, pdev->dev.parent,
- regmap, pdata);
+ ret = rk808_regulator_dt_parse_pdata(&pdev->dev, regmap, pdata);
if (ret < 0)
return ret;
@@ -1335,8 +1336,6 @@ static int rk808_regulator_probe(struct platform_device *pdev)
}
config.dev = &pdev->dev;
- config.dev->of_node = pdev->dev.parent->of_node;
- config.dev->of_node_reused = true;
config.driver_data = pdata;
config.regmap = regmap;
--
2.39.2
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2023-05-04 17:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 17:36 [PATCH v8 00/14] mfd/pinctrl/regulator: Add RK806 Support Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 01/14] clk: RK808: reduce 'struct rk808' usage Sebastian Reichel
2023-05-15 15:14 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 02/14] mfd: rk808: convert to device managed resources Sebastian Reichel
2023-05-15 15:17 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 03/14] mfd: rk808: use dev_err_probe Sebastian Reichel
2023-05-15 15:18 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 04/14] mfd: rk808: replace 'struct i2c_client' with 'struct device' Sebastian Reichel
2023-05-15 15:18 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 05/14] mfd: rk808: split into core and i2c Sebastian Reichel
2023-05-15 15:19 ` Lee Jones
[not found] ` <CGME20230516212700eucas1p1fbde1b6181c18d821e0796b6b6a4fa00@eucas1p1.samsung.com>
2023-05-16 21:26 ` Marek Szyprowski
2023-05-16 22:01 ` Sebastian Reichel
2023-06-30 11:34 ` Geert Uytterhoeven
2023-06-30 18:48 ` Sebastian Reichel
2023-07-04 13:08 ` Geert Uytterhoeven
2023-05-04 17:36 ` [PATCH v8 06/14] mfd: rk8xx-i2c: use device_get_match_data Sebastian Reichel
2023-05-15 15:19 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 07/14] dt-bindings: mfd: add rk806 binding Sebastian Reichel
2023-05-15 15:20 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 08/14] mfd: rk8xx: add rk806 support Sebastian Reichel
2023-05-15 15:20 ` Lee Jones
2023-11-15 17:17 ` Neil Armstrong
2023-11-15 18:00 ` Sebastian Reichel
2023-11-16 8:41 ` Neil Armstrong
2023-11-16 11:30 ` Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 09/14] pinctrl: rk805: add rk806 pinctrl support Sebastian Reichel
2023-05-15 15:21 ` Lee Jones
2023-05-04 17:36 ` [PATCH v8 10/14] regulator: expose regulator_find_closest_bigger Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 11/14] regulator: rk808: fix asynchronous probing Sebastian Reichel
2023-05-04 17:36 ` Sebastian Reichel [this message]
2023-05-04 17:36 ` [PATCH v8 13/14] regulator: rk808: revert to synchronous probing Sebastian Reichel
2023-05-04 17:36 ` [PATCH v8 14/14] regulator: rk808: add rk806 support Sebastian Reichel
2023-05-15 15:24 ` [GIT PULL] Immutable branch between MFD, Clk, Input, Pinctrl, RTC, Power, Regulator and Sound due for the v6.5 merge window Lee Jones
2023-05-23 21:44 ` (subset) [PATCH v8 00/14] mfd/pinctrl/regulator: Add RK806 Support Mark Brown
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=20230504173618.142075-13-sebastian.reichel@collabora.com \
--to=sebastian.reichel@collabora.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=kernel@collabora.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lee@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@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).