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: [PATCHv3 04/14] regulator: rk808: reduce 'struct rk808' usage Date: Fri, 9 Sep 2022 19:55:12 +0200 [thread overview] Message-ID: <20220909175522.179175-5-sebastian.reichel@collabora.com> (raw) In-Reply-To: <20220909175522.179175-1-sebastian.reichel@collabora.com> Reduce usage of 'struct rk808' (driver data of the parent MFD), so that only the chip variant field is still being accessed directly. This allows restructuring the MFD driver to support SPI based PMICs. Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> --- drivers/regulator/rk808-regulator.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index 127dc2e2e690..ce9c64cadeba 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -14,7 +14,6 @@ #include <linux/delay.h> #include <linux/gpio.h> -#include <linux/i2c.h> #include <linux/module.h> #include <linux/of_device.h> #include <linux/of_gpio.h> @@ -1286,19 +1285,23 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, static int rk808_regulator_probe(struct platform_device *pdev) { struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent); - struct i2c_client *client = rk808->i2c; struct regulator_config config = {}; struct regulator_dev *rk808_rdev; struct rk808_regulator_data *pdata; const struct regulator_desc *regulators; + struct regmap *regmap; int ret, i, nregulators; + regmap = dev_get_regmap(pdev->dev.parent, NULL); + if (!regmap) + return -ENODEV; + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; - ret = rk808_regulator_dt_parse_pdata(&pdev->dev, &client->dev, - rk808->regmap, pdata); + ret = rk808_regulator_dt_parse_pdata(&pdev->dev, pdev->dev.parent, + regmap, pdata); if (ret < 0) return ret; @@ -1326,21 +1329,22 @@ static int rk808_regulator_probe(struct platform_device *pdev) nregulators = RK818_NUM_REGULATORS; break; default: - dev_err(&client->dev, "unsupported RK8XX ID %lu\n", + dev_err(&pdev->dev, "unsupported RK8XX ID %lu\n", rk808->variant); return -EINVAL; } - config.dev = &client->dev; + config.dev = &pdev->dev; + config.dev->of_node = pdev->dev.parent->of_node; config.driver_data = pdata; - config.regmap = rk808->regmap; + config.regmap = regmap; /* Instantiate the regulators */ for (i = 0; i < nregulators; i++) { rk808_rdev = devm_regulator_register(&pdev->dev, ®ulators[i], &config); if (IS_ERR(rk808_rdev)) { - dev_err(&client->dev, + dev_err(&pdev->dev, "failed to register %d regulator\n", i); return PTR_ERR(rk808_rdev); } -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
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: [PATCHv3 04/14] regulator: rk808: reduce 'struct rk808' usage Date: Fri, 9 Sep 2022 19:55:12 +0200 [thread overview] Message-ID: <20220909175522.179175-5-sebastian.reichel@collabora.com> (raw) In-Reply-To: <20220909175522.179175-1-sebastian.reichel@collabora.com> Reduce usage of 'struct rk808' (driver data of the parent MFD), so that only the chip variant field is still being accessed directly. This allows restructuring the MFD driver to support SPI based PMICs. Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> --- drivers/regulator/rk808-regulator.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index 127dc2e2e690..ce9c64cadeba 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -14,7 +14,6 @@ #include <linux/delay.h> #include <linux/gpio.h> -#include <linux/i2c.h> #include <linux/module.h> #include <linux/of_device.h> #include <linux/of_gpio.h> @@ -1286,19 +1285,23 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, static int rk808_regulator_probe(struct platform_device *pdev) { struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent); - struct i2c_client *client = rk808->i2c; struct regulator_config config = {}; struct regulator_dev *rk808_rdev; struct rk808_regulator_data *pdata; const struct regulator_desc *regulators; + struct regmap *regmap; int ret, i, nregulators; + regmap = dev_get_regmap(pdev->dev.parent, NULL); + if (!regmap) + return -ENODEV; + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; - ret = rk808_regulator_dt_parse_pdata(&pdev->dev, &client->dev, - rk808->regmap, pdata); + ret = rk808_regulator_dt_parse_pdata(&pdev->dev, pdev->dev.parent, + regmap, pdata); if (ret < 0) return ret; @@ -1326,21 +1329,22 @@ static int rk808_regulator_probe(struct platform_device *pdev) nregulators = RK818_NUM_REGULATORS; break; default: - dev_err(&client->dev, "unsupported RK8XX ID %lu\n", + dev_err(&pdev->dev, "unsupported RK8XX ID %lu\n", rk808->variant); return -EINVAL; } - config.dev = &client->dev; + config.dev = &pdev->dev; + config.dev->of_node = pdev->dev.parent->of_node; config.driver_data = pdata; - config.regmap = rk808->regmap; + config.regmap = regmap; /* Instantiate the regulators */ for (i = 0; i < nregulators; i++) { rk808_rdev = devm_regulator_register(&pdev->dev, ®ulators[i], &config); if (IS_ERR(rk808_rdev)) { - dev_err(&client->dev, + dev_err(&pdev->dev, "failed to register %d regulator\n", i); return PTR_ERR(rk808_rdev); } -- 2.35.1 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-09-09 17:55 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-09 17:55 [PATCHv3 00/14] Introduce RK806 Support Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-09 17:55 ` [PATCHv3 01/14] mfd: rk808: convert to device managed resources Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-28 13:38 ` Lee Jones 2022-09-28 13:38 ` Lee Jones 2022-09-09 17:55 ` [PATCHv3 02/14] mfd: rk808: use dev_err_probe Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-28 13:51 ` Lee Jones 2022-09-28 13:51 ` Lee Jones 2022-09-09 17:55 ` [PATCHv3 03/14] clk: RK808: reduce 'struct rk808' usage Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel [this message] 2022-09-09 17:55 ` [PATCHv3 04/14] regulator: rk808: " Sebastian Reichel 2022-09-09 17:55 ` [PATCHv3 05/14] rtc: " Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-09 17:55 ` [PATCHv3 06/14] mfd: rk808: replace 'struct i2c_client' with 'struct device' Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-28 14:00 ` Lee Jones 2022-09-28 14:00 ` Lee Jones 2022-09-09 17:55 ` [PATCHv3 07/14] mfd: rk808: split into core and i2c Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-28 14:13 ` Lee Jones 2022-09-28 14:13 ` Lee Jones 2022-09-09 17:55 ` [PATCHv3 08/14] dt-bindings: mfd: add rk806 binding Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-10 8:03 ` Krzysztof Kozlowski 2022-09-10 8:03 ` Krzysztof Kozlowski 2022-09-09 17:55 ` [PATCHv3 09/14] mfd: rk8xx: add rk806 support Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-28 14:35 ` Lee Jones 2022-09-28 14:35 ` Lee Jones 2022-09-09 17:55 ` [PATCHv3 10/14] pinctrl: rk805: add rk806 pinctrl support Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-09 17:55 ` [PATCHv3 11/14] regulator: rk808: Use dev_err_probe Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-09 17:55 ` [PATCHv3 12/14] regulator: expose regmap_find_closest_bigger Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-10 17:17 ` Matti Vaittinen 2022-09-10 17:17 ` Matti Vaittinen 2022-09-19 14:15 ` Sebastian Reichel 2022-09-19 14:15 ` Sebastian Reichel 2022-09-28 17:37 ` Mark Brown 2022-09-28 17:37 ` Mark Brown 2022-09-09 17:55 ` [PATCHv3 13/14] regulator: rk808: add rk806 support Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-09-10 17:03 ` Matti Vaittinen 2022-09-10 17:03 ` Matti Vaittinen 2022-09-09 17:55 ` [PATCHv3 14/14] ASoC: rk817: Remove 'select REGMAP_I2C' Sebastian Reichel 2022-09-09 17:55 ` Sebastian Reichel 2022-11-28 19:05 ` (subset) [PATCHv3 00/14] Introduce RK806 Support Mark Brown 2022-11-28 19:05 ` 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=20220909175522.179175-5-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.