Add Poweroff/Reset for rk8xx PMIC
Subsystems (2)
cover Add Poweroff/Reset for rk8xx PMIC
From: Frank Wunderlich <[email protected]>
This Series adds Reset functionality for rk805,rk808,rk809,rk817, rk818 PMIC and poweroff feature for rk809.
Frank Wunderlich (1):
mfd: rk808: Add poweroff and reboot support for rk809 pmic
Peter Geis (1):
mfd: rk808: add reboot support to rk808 pmic
drivers/mfd/rk808.c | 50 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/rk808.h | 2 ++ 2 files changed, 52 insertions(+)
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 1/2 mfd: rk808: add reboot support to rk808 pmic
From: Peter Geis <[email protected]>
This adds reboot support to the rk808 pmic. This only enables if the rockchip,system-power-controller flag is set.
--- drivers/mfd/rk808.c | 48 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/rk808.h | 2 ++ 2 files changed, 50 insertions(+)
drivers/mfd/rk808.c +48 -0
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/of_device.h> #include <linux/regmap.h> +#include <linux/reboot.h> struct rk808_reg_data {int addr;
@@ -533,6 +534,7 @@ static void rk808_pm_power_off(void)int ret;unsigned int reg, bit;struct rk808 *rk808 =i2c_get_clientdata (rk808_i2c_client); +dev_err (&rk808_i2c_client->dev,"poweroff device!\n" );switch (rk808->variant) {case RK805_ID :
@@ -552,6 +554,7 @@ static void rk808_pm_power_off(void) bit =DEV_OFF ;break ;default : +dev_err (&rk808_i2c_client->dev,"poweroff device not supported!\n" );return ; } ret =regmap_update_bits (rk808->regmap, reg, bit, bit);
@@ -559,6 +562,44 @@ static void rk808_pm_power_off(void)dev_err (&rk808_i2c_client->dev,"Failed to shutdown device!\n" ); } +static int rk808_restart_notify (struct notifier_block *this,unsigned long mode,void *cmd) +{ +int ret; +unsigned int reg, bit; +struct rk808 *rk808 =i2c_get_clientdata (rk808_i2c_client); + +switch (rk808->variant) { +case RK805_ID : + reg =RK805_DEV_CTRL_REG ; + bit =DEV_OFF_RST ; +break ; +case RK808_ID : + reg =RK808_DEVCTRL_REG , + bit =DEV_OFF ; +break ; +case RK817_ID : + reg =RK817_SYS_CFG (3 ); + bit =DEV_RST ; +break ; +case RK818_ID : + reg =RK818_DEVCTRL_REG ; + bit =DEV_OFF_RST ; +break ; +default : +return NOTIFY_DONE ; + } + ret =regmap_update_bits (rk808->regmap, reg, bit, bit); +if (ret) +dev_err (&rk808_i2c_client->dev,"Failed to restart device!\n" ); + +return NOTIFY_DONE ; +} + +static struct notifier_block rk808_restart_handler = { + .notifier_call = rk808_restart_notify, + .priority =255 , +}; +static void rk8xx_shutdown (struct i2c_client *client) {struct rk808 *rk808 =i2c_get_clientdata (client);
@@ -727,6 +768,13 @@ static int rk808_probe(struct i2c_client *client,if (of_property_read_bool (np,"rockchip,system-power-controller" )) { rk808_i2c_client = client; pm_power_off = rk808_pm_power_off; + rk808->nb = &rk808_restart_handler; + +dev_warn (&client->dev,"register restart handler\n" ); + + ret =register_restart_handler (rk808->nb); +if (ret) +dev_err (&client->dev,"failed to register restart handler, %d\n" , ret); }return 0 ;
include/linux/mfd/rk808.h +2 -0
@@ -373,6 +373,7 @@ enum rk805_reg {#define SWITCH2_EN BIT(6)#define SWITCH1_EN BIT(5)#define DEV_OFF_RST BIT(3) +#define DEV_RST BIT(2)#define DEV_OFF BIT(0)#define RTC_STOP BIT(0)
@@ -701,5 +702,6 @@ struct rk808 {long variant;const struct regmap_config *regmap_cfg;const struct regmap_irq_chip *regmap_irq_chip; + struct notifier_block *nb; };#endif /* __LINUX_REGULATOR_RK808_H */
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH 1/2] mfd: rk808: add reboot support to rk808 pmic
Quoted 11 lines · On Mittwoch, 15. Dezember 2021 22:32:59 CET Frank Wunderlich wrote:
From: Peter Geis <[email protected]>
This adds reboot support to the rk808 pmic. This only enables if the rockchip,system-power-controller flag is set.
Signed-off-by Peter Geis <[email protected]>--- drivers/mfd/rk808.c | 48 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/rk808.h | 2 ++ 2 files changed, 50 insertions(+)
Tested with a RK817, using a Quartz64 Model A with the patch applied on top of v5.16-rc5. Poweroff works, reboot works.
Re: [PATCH 1/2] mfd: rk808: add reboot support to rk808 pmic
Quoted 14 lines · Nicolas Frattaroli
Quoted 11 lines · On Mittwoch, 15. Dezember 2021 22:32:59 CET Frank Wunderlich wrote:
From: Peter Geis <[email protected]>
This adds reboot support to the rk808 pmic. This only enables if the rockchip,system-power-controller flag is set.
Signed-off-by Peter Geis <[email protected]>--- drivers/mfd/rk808.c | 48 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/rk808.h | 2 ++ 2 files changed, 50 insertions(+)
Quoted 6 lines
Tested-by Nicolas Frattaroli <[email protected]>Tested with a RK817, using a Quartz64 Model A with the patch applied on top of v5.16-rc5. Poweroff works, reboot works.
As a note, this has come up due to rk356x having unreliable psci reboot. Until we have mainline atf sources so we can fix the problem this is the only way to reliably reset these devices.
Re: [PATCH 1/2] mfd: rk808: add reboot support to rk808 pmic
In reply to Frank WunderlichQuoted 24 lines · Frank Wunderlich
From: Peter Geis <[email protected]>
This adds reboot support to the rk808 pmic. This only enables if the rockchip,system-power-controller flag is set.
Signed-off-by Peter Geis <[email protected]>--- drivers/mfd/rk808.c | 48 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/rk808.h | 2 ++ 2 files changed, 50 insertions(+)drivers/mfd/rk808.c +1
-0@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/of_device.h> #include <linux/regmap.h> +#include <linux/reboot.h> struct rk808_reg_data {int addr;
drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 537
Quoted 4 lines
drivers/mfd/rk808.c +1
-0@@ -533,6 +534,7 @@ static void rk808_pm_power_off(void)int ret;unsigned int reg, bit;struct rk808 *rk808 =i2c_get_clientdata (rk808_i2c_client); +dev_err (&rk808_i2c_client->dev,"poweroff device!\n" );
This is not an error.
drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 557
Quoted 8 lines
drivers/mfd/rk808.c +1
-0switch (rk808->variant) {case RK805_ID :@@ -552,6 +554,7 @@ static void rk808_pm_power_off(void) bit =DEV_OFF ;break ;default : +dev_err (&rk808_i2c_client->dev,"poweroff device not supported!\n" );
If we really don't support power off for the present PMIC then we should avoid registering the power off handler in the first place. These default cases should mostly just serve to keep static checkers happy.
Quoted 11 lines
drivers/mfd/rk808.c +4
-0return ; } ret =regmap_update_bits (rk808->regmap, reg, bit, bit);@@ -559,6 +562,44 @@ static void rk808_pm_power_off(void)dev_err (&rk808_i2c_client->dev,"Failed to shutdown device!\n" ); } +static int rk808_restart_notify (struct notifier_block *this,unsigned long mode,void *cmd) +{ +int ret; +unsigned int reg, bit;
drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 578
Quoted 10 lines
drivers/mfd/rk808.c +10
-0+struct rk808 *rk808 =i2c_get_clientdata (rk808_i2c_client); + +switch (rk808->variant) { +case RK805_ID : + reg =RK805_DEV_CTRL_REG ; + bit =DEV_OFF_RST ; +break ; +case RK808_ID : + reg =RK808_DEVCTRL_REG , + bit =DEV_OFF ;
Is that right? The RK808 datasheet does say that this bit resets itself once the OFF state is reached, but there doesn't seem to be any obvious guarantee of a power-on condition being present to automatically transition back to ACTIVE.
Quoted 28 lines
drivers/mfd/rk808.c +24
-0+break ; +case RK817_ID : + reg =RK817_SYS_CFG (3 ); + bit =DEV_RST ; +break ; +case RK818_ID : + reg =RK818_DEVCTRL_REG ; + bit =DEV_OFF_RST ; +break ; +default : +return NOTIFY_DONE ; + } + ret =regmap_update_bits (rk808->regmap, reg, bit, bit); +if (ret) +dev_err (&rk808_i2c_client->dev,"Failed to restart device!\n" ); + +return NOTIFY_DONE ; +} + +static struct notifier_block rk808_restart_handler = { + .notifier_call = rk808_restart_notify, + .priority =255 , +}; +static void rk8xx_shutdown (struct i2c_client *client) {struct rk808 *rk808 =i2c_get_clientdata (client);
drivers/mfd/rk808.c static int rk808_probe(struct i2c_client *client, · line 771
Quoted 4 lines
drivers/mfd/rk808.c +1
-0@@ -727,6 +768,13 @@ static int rk808_probe(struct i2c_client *client,if (of_property_read_bool (np,"rockchip,system-power-controller" )) { rk808_i2c_client = client; pm_power_off = rk808_pm_power_off; + rk808->nb = &rk808_restart_handler;
The handler just relies on the global rk808_i2c_client anyway, so does this serve any purpose?
drivers/mfd/rk808.c static int rk808_probe(struct i2c_client *client, · line 773
Quoted 2 lines
drivers/mfd/rk808.c +2
-0+ +dev_warn (&client->dev,"register restart handler\n" );
Don't scream a warning about normal and expected operation.
Thanks,
Robin.
Quoted 26 lines
drivers/mfd/rk808.c +4
-0+ + ret =register_restart_handler (rk808->nb); +if (ret) +dev_err (&client->dev,"failed to register restart handler, %d\n" , ret); }return 0 ;include/linux/mfd/rk808.h +2
-0@@ -373,6 +373,7 @@ enum rk805_reg {#define SWITCH2_EN BIT(6)#define SWITCH1_EN BIT(5)#define DEV_OFF_RST BIT(3) +#define DEV_RST BIT(2)#define DEV_OFF BIT(0)#define RTC_STOP BIT(0)@@ -701,5 +702,6 @@ struct rk808 {long variant;const struct regmap_config *regmap_cfg;const struct regmap_irq_chip *regmap_irq_chip; + struct notifier_block *nb; };#endif /* __LINUX_REGULATOR_RK808_H */
Aw: Re: [PATCH 1/2] mfd: rk808: add reboot support to rk808 pmic
Hi Robin
thanks for your review
Quoted 6 lines
Gesendet: Donnerstag, 16. Dezember 2021 um 14:17 Uhr
Von: "Robin Murphy" <[email protected]>drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 537
Quoted 1 line
drivers/mfd/rk808.c +1
-0+dev_err (&rk808_i2c_client->dev,"poweroff device!\n" );This is not an error.
ack, we can change to dev_dbg/dev_info or drop completely
Quoted 9 lines
drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 557
Quoted 5 lines
drivers/mfd/rk808.c +1
-0@@ -552,6 +554,7 @@ static void rk808_pm_power_off(void) bit =DEV_OFF ;break ;default : +dev_err (&rk808_i2c_client->dev,"poweroff device not supported!\n" );If we really don't support power off for the present PMIC then we should avoid registering the power off handler in the first place. These default cases should mostly just serve to keep static checkers happy.
currently we had added all device-ids supported by probe. Before my Patch (Part2) rk809 was missing. It is not registered for (currently) unsupported IDs as probe exits with -EINVAL for unsupported IDs before.
If anyone adds init-code in future but not poweroff/restart part we ran into this. So i would leave this message.
registering handler depending on supported devices (for poweroff/restart function) imho makes code less readable.
Quoted 15 lines
Quoted 15 lines
drivers/mfd/rk808.c +11
-0@@ -559,6 +562,44 @@ static void rk808_pm_power_off(void)dev_err (&rk808_i2c_client->dev,"Failed to shutdown device!\n" ); } +static int rk808_restart_notify (struct notifier_block *this,unsigned long mode,void *cmd) +{ +int ret; +unsigned int reg, bit; +struct rk808 *rk808 =i2c_get_clientdata (rk808_i2c_client); + +switch (rk808->variant) { +case RK805_ID : + reg =RK805_DEV_CTRL_REG ; + bit =DEV_OFF_RST ; +break ;
Quoted 8 lines
drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 578
Quoted 3 lines
drivers/mfd/rk808.c +3
-0+case RK808_ID : + reg =RK808_DEVCTRL_REG , + bit =DEV_OFF ;Is that right? The RK808 datasheet does say that this bit resets itself once the OFF state is reached, but there doesn't seem to be any obvious guarantee of a power-on condition being present to automatically transition back to ACTIVE.
i think you're right...imho it should be DEV_OFF_RST in restart_notify and DEV_OFF in poweroff
Quoted 8 lines
drivers/mfd/rk808.c static int rk808_probe(struct i2c_client *client, · line 771
Quoted 5 lines
drivers/mfd/rk808.c +1
-0@@ -727,6 +768,13 @@ static int rk808_probe(struct i2c_client *client,if (of_property_read_bool (np,"rockchip,system-power-controller" )) { rk808_i2c_client = client; pm_power_off = rk808_pm_power_off; + rk808->nb = &rk808_restart_handler;The handler just relies on the global
rk808_i2c_clientanyway, so does this serve any purpose?
i guess
ret = register_restart_handler(&rk808_restart_handler);
is better here too.
i cannot figure out why storing the function-pointer in rk808->nb too as this seems not to be used anywhere else
Quoted 4 lines
drivers/mfd/rk808.c static int rk808_probe(struct i2c_client *client, · line 773
Quoted 2 lines
drivers/mfd/rk808.c +2
-0+ +dev_warn (&client->dev,"register restart handler\n" );Don't scream a warning about normal and expected operation.
ack
Quoted 2 lines
Thanks,
Robin.
@Peter, what do you think?
regards Frank
Re: Re: [PATCH 1/2] mfd: rk808: add reboot support to rk808 pmic
Quoted 4 lines · Frank Wunderlich
Hi Robin
thanks for your review
Good Evening,
Quoted 9 lines
Quoted 7 lines
Gesendet: Donnerstag, 16. Dezember 2021 um 14:17 Uhr
Von: "Robin Murphy" <[email protected]>Quoted 1 line
+
dev_err(&rk808_i2c_client->dev, "poweroff device!\n");This is not an error.
ack, we can change to dev_dbg/dev_info or drop completely
Yes, this was set to isolate down when individuals were having issues on a specific distro that unfortunately defaults to a silent boot. It can be dropped at this point.
Quoted 11 lines
Quoted 10 lines
drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 557
Quoted 6 lines
drivers/mfd/rk808.c +1
-0@@ -552,6 +554,7 @@ static void rk808_pm_power_off(void) bit =DEV_OFF ;break ;default : +dev_err (&rk808_i2c_client->dev,"poweroff device not supported!\n" );If we really don't support power off for the present PMIC then we should avoid registering the power off handler in the first place. These default cases should mostly just serve to keep static checkers happy.
Quoted 6 lines
currently we had added all device-ids supported by probe. Before my Patch (Part2) rk809 was missing. It is not registered for (currently) unsupported IDs as probe exits with
-EINVALfor unsupported IDs before.If anyone adds init-code in future but not poweroff/restart part we ran into this. So i would leave this message.
registering handler depending on supported devices (for poweroff/restart function) imho makes code less readable.
I added that just in case someone put in support for a new device without checking everything.
I don't have any particular attachment to it however.
Quoted 25 lines
Quoted 16 lines
Quoted 16 lines
drivers/mfd/rk808.c +11
-0@@ -559,6 +562,44 @@ static void rk808_pm_power_off(void)dev_err (&rk808_i2c_client->dev,"Failed to shutdown device!\n" ); } +static int rk808_restart_notify (struct notifier_block *this,unsigned long mode,void *cmd) +{ +int ret; +unsigned int reg, bit; +struct rk808 *rk808 =i2c_get_clientdata (rk808_i2c_client); + +switch (rk808->variant) { +case RK805_ID : + reg =RK805_DEV_CTRL_REG ; + bit =DEV_OFF_RST ; +break ;Quoted 8 lines
drivers/mfd/rk808.c static void rk808_pm_power_off(void) · line 578
Quoted 3 lines
drivers/mfd/rk808.c +3
-0+case RK808_ID : + reg =RK808_DEVCTRL_REG , + bit =DEV_OFF ;Is that right? The RK808 datasheet does say that this bit resets itself once the OFF state is reached, but there doesn't seem to be any obvious guarantee of a power-on condition being present to automatically transition back to ACTIVE.
Quoted 1 line
i think you're right...imho it should be
DEV_OFF_RSTinrestart_notifyandDEV_OFFin poweroff
I've tested this on the rockpro64, DEV_OFF_RST and DEV_OFF both power down the rk808.
The difference is the DEV_OFF_RST "activate reset of the digital core". This is similar to the description of pressing the RESET key, with the exception of not powering up the PMIC.
It seems the rk808 doesn't support software resetting at all per the trm. We should drop reset support for the rk808.
The only way I can see triggering a reset in the rk808 being possible is by setting the RTC alarm to wake the device shortly after powering down.
Quoted 10 lines
Quoted 9 lines
drivers/mfd/rk808.c static int rk808_probe(struct i2c_client *client, · line 771
Quoted 6 lines
drivers/mfd/rk808.c +1
-0@@ -727,6 +768,13 @@ static int rk808_probe(struct i2c_client *client,if (of_property_read_bool (np,"rockchip,system-power-controller" )) { rk808_i2c_client = client; pm_power_off = rk808_pm_power_off; + rk808->nb = &rk808_restart_handler;The handler just relies on the global
rk808_i2c_clientanyway, so does this serve any purpose?
Quoted 7 lines
i guess
ret =
register_restart_handler(&rk808_restart_handler);is better here too.
i cannot figure out why storing the function-pointer in
rk808->nbtoo as this seems not to be used anywhere else
I can't remember why I set this up like this, probably "borrowed" from another driver somewhere.
Go ahead and change it.
Quoted 7 lines
Quoted 5 lines
drivers/mfd/rk808.c static int rk808_probe(struct i2c_client *client, · line 773
Quoted 3 lines
drivers/mfd/rk808.c +2
-0+ +dev_warn (&client->dev,"register restart handler\n" );Don't scream a warning about normal and expected operation.
ack
This was to check that it was in fact registering, drop it.
Quoted 7 lines
Quoted 3 lines
Thanks,
Robin.@Peter, what do you think?
regards Frank
Thank you for the review Robin and the submission Frank.
Always,
Peter
PATCH 2/2 mfd: rk808: Add poweroff and reboot support for rk809 pmic
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add support for reset/poweroff rk809. It uses same Register and Values like rk817 so just add the Chip_id.
--- drivers/mfd/rk808.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mfd/rk808.c +2 -0
@@ -545,6 +545,7 @@ static void rk808_pm_power_off(void) reg =RK808_DEVCTRL_REG , bit =DEV_OFF_RST ;break ; +case RK809_ID :case RK817_ID : reg =RK817_SYS_CFG (3 ); bit =DEV_OFF ;
@@ -577,6 +578,7 @@ static int rk808_restart_notify(struct notifier_block *this, unsigned long mode, reg =RK808_DEVCTRL_REG , bit =DEV_OFF ;break ; +case RK809_ID :case RK817_ID : reg =RK817_SYS_CFG (3 ); bit =DEV_RST ;
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip