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, Diederik de Haas <didi.debian@cknow.org>,
Vincent Legoll <vincent.legoll@gmail.com>
Subject: [PATCH v8 02/14] mfd: rk808: convert to device managed resources
Date: Thu, 4 May 2023 19:36:06 +0200 [thread overview]
Message-ID: <20230504173618.142075-3-sebastian.reichel@collabora.com> (raw)
In-Reply-To: <20230504173618.142075-1-sebastian.reichel@collabora.com>
Fully convert the driver to device managed resources.
Acked-for-MFD-by: Lee Jones <lee@kernel.org>
Tested-by: Diederik de Haas <didi.debian@cknow.org> # Rock64, Quartz64 Model A + B
Tested-by: Vincent Legoll <vincent.legoll@gmail.com> # Pine64 QuartzPro64
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
drivers/mfd/rk808.c | 64 ++++++++++++++++-----------------------------
1 file changed, 22 insertions(+), 42 deletions(-)
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 0f22ef61e817..a996a43f9204 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -548,13 +548,11 @@ static const struct regmap_irq_chip rk818_irq_chip = {
.init_ack_masked = true,
};
-static struct i2c_client *rk808_i2c_client;
-
-static void rk808_pm_power_off(void)
+static int rk808_power_off(struct sys_off_data *data)
{
+ struct rk808 *rk808 = data->cb_data;
int ret;
unsigned int reg, bit;
- struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
switch (rk808->variant) {
case RK805_ID:
@@ -575,16 +573,18 @@ static void rk808_pm_power_off(void)
bit = DEV_OFF;
break;
default:
- return;
+ return NOTIFY_DONE;
}
ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
if (ret)
- dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n");
+ dev_err(&rk808->i2c->dev, "Failed to shutdown device!\n");
+
+ return NOTIFY_DONE;
}
-static int rk808_restart_notify(struct notifier_block *this, unsigned long mode, void *cmd)
+static int rk808_restart(struct sys_off_data *data)
{
- struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
+ struct rk808 *rk808 = data->cb_data;
unsigned int reg, bit;
int ret;
@@ -600,16 +600,11 @@ static int rk808_restart_notify(struct notifier_block *this, unsigned long mode,
}
ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
if (ret)
- dev_err(&rk808_i2c_client->dev, "Failed to restart device!\n");
+ dev_err(&rk808->i2c->dev, "Failed to restart device!\n");
return NOTIFY_DONE;
}
-static struct notifier_block rk808_restart_handler = {
- .notifier_call = rk808_restart_notify,
- .priority = 192,
-};
-
static void rk8xx_shutdown(struct i2c_client *client)
{
struct rk808 *rk808 = i2c_get_clientdata(client);
@@ -745,9 +740,9 @@ static int rk808_probe(struct i2c_client *client)
return -EINVAL;
}
- ret = regmap_add_irq_chip(rk808->regmap, client->irq,
- IRQF_ONESHOT, -1,
- rk808->regmap_irq_chip, &rk808->irq_data);
+ ret = devm_regmap_add_irq_chip(&client->dev, rk808->regmap, client->irq,
+ IRQF_ONESHOT, -1,
+ rk808->regmap_irq_chip, &rk808->irq_data);
if (ret) {
dev_err(&client->dev, "Failed to add irq_chip %d\n", ret);
return ret;
@@ -771,17 +766,23 @@ static int rk808_probe(struct i2c_client *client)
regmap_irq_get_domain(rk808->irq_data));
if (ret) {
dev_err(&client->dev, "failed to add MFD devices %d\n", ret);
- goto err_irq;
+ return ret;
}
if (of_property_read_bool(np, "rockchip,system-power-controller")) {
- rk808_i2c_client = client;
- pm_power_off = rk808_pm_power_off;
+ ret = devm_register_sys_off_handler(&client->dev,
+ SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
+ &rk808_power_off, rk808);
+ if (ret)
+ return dev_err_probe(&client->dev, ret,
+ "failed to register poweroff handler\n");
switch (rk808->variant) {
case RK809_ID:
case RK817_ID:
- ret = register_restart_handler(&rk808_restart_handler);
+ ret = devm_register_sys_off_handler(&client->dev,
+ SYS_OFF_MODE_RESTART, SYS_OFF_PRIO_HIGH,
+ &rk808_restart, rk808);
if (ret)
dev_warn(&client->dev, "failed to register rst handler, %d\n", ret);
break;
@@ -792,26 +793,6 @@ static int rk808_probe(struct i2c_client *client)
}
return 0;
-
-err_irq:
- regmap_del_irq_chip(client->irq, rk808->irq_data);
- return ret;
-}
-
-static void rk808_remove(struct i2c_client *client)
-{
- struct rk808 *rk808 = i2c_get_clientdata(client);
-
- regmap_del_irq_chip(client->irq, rk808->irq_data);
-
- /**
- * pm_power_off may points to a function from another module.
- * Check if the pointer is set by us and only then overwrite it.
- */
- if (pm_power_off == rk808_pm_power_off)
- pm_power_off = NULL;
-
- unregister_restart_handler(&rk808_restart_handler);
}
static int __maybe_unused rk8xx_suspend(struct device *dev)
@@ -868,7 +849,6 @@ static struct i2c_driver rk808_i2c_driver = {
.pm = &rk8xx_pm_ops,
},
.probe_new = rk808_probe,
- .remove = rk808_remove,
.shutdown = rk8xx_shutdown,
};
--
2.39.2
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 ` Sebastian Reichel [this message]
2023-05-15 15:17 ` [PATCH v8 02/14] mfd: rk808: convert to device managed resources 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 ` [PATCH v8 12/14] regulator: rk808: cleanup parent device usage Sebastian Reichel
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-3-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=didi.debian@cknow.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 \
--cc=vincent.legoll@gmail.com \
/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).