This fixes a regression from v6.1 to v6.6 where Google Veyron devices
(rk3288) would not power off after being shut down.

Prior to commit 4fec8a5a85c4 ("mfd: rk808: Convert to device managed
resources"), pm_power_off was called by legacy_pm_power_off() which
itself was registered using SYS_OFF_MODE_POWER_OFF. But in that commit
the registration of rk808_power_off() moved to
SYS_OFF_MODE_POWER_OFF_PREPARE. At the very least, the code should be
consistent between SYS_OFF_MODE_POWER_OFF and SYS_OFF_MODE_RESTART; both
should be *_PREPARE or both not.

It appears interrupt delivery is already shut down (but not disabled)
when SYS_OFF_MODE_POWER_OFF_PREPARE is triggered, so
regmap_update_bits() in rk808_power_off() does not complete
successfully. Registering rk808_power_off() as SYS_OFF_MODE_POWER_OFF
runs with interrupts disabled which causes polling I/O to be used
instead, and the device to power down.

Fixes: 4fec8a5a85c4 ("mfd: rk808: Convert to device managed resources")
Signed-off-by: Eric Anderson <ejona86@gmail.com>
Assisted-by: Gemini:gemini-3.5-flash
---
 drivers/mfd/rk8xx-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
index 3dcf6abfda74..21182df45d1b 100644
--- a/drivers/mfd/rk8xx-core.c
+++ b/drivers/mfd/rk8xx-core.c
@@ -875,7 +875,7 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap
 	if (device_property_read_bool(dev, "system-power-controller") ||
 	    device_property_read_bool(dev, "rockchip,system-power-controller")) {
 		ret = devm_register_sys_off_handler(dev,
-				    SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
+				    SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_HIGH,
 				    &rk808_power_off, rk808);
 		if (ret)
 			return dev_err_probe(dev, ret,

---
base-commit: f5098b6bae761e346ebcd9da7f95622c04733cff
change-id: 20260908-veyron-shutdown-09b3faffb5f9

Best regards,
--  
Eric Anderson <ejona86@gmail.com>

On Tue, 08 Sep 2026 12:20:39 -0700, Eric Anderson wrote:
> This fixes a regression from v6.1 to v6.6 where Google Veyron devices
> (rk3288) would not power off after being shut down.
> 
> Prior to commit 4fec8a5a85c4 ("mfd: rk808: Convert to device managed
> resources"), pm_power_off was called by legacy_pm_power_off() which
> itself was registered using SYS_OFF_MODE_POWER_OFF. But in that commit
> the registration of rk808_power_off() moved to
> SYS_OFF_MODE_POWER_OFF_PREPARE. At the very least, the code should be
> consistent between SYS_OFF_MODE_POWER_OFF and SYS_OFF_MODE_RESTART; both
> should be *_PREPARE or both not.
> 
> [...]

Applied, thanks!

[1/1] mfd: rk8xx: Register poweroff handler in atomic phase
      commit: a9c8cbec9f5d209efb3d8811f7d46d7af39504d1

--
Lee Jones [李琼斯]