[PATCH] Update PMU patch for 5.19
From 6541d5feb106c20438a8ada894b12122f7e4ae86 Mon Sep 17 00:00:00 2001
From: Max Fierke <max@maxfierke.com>
Date: Sat, 6 Aug 2022 13:50:07 -0500
Subject: [PATCH] clockworkpi-a06: Refactor rk808 hack to use sys_off handler
pm_power_off_prepare was removed in 5.19 in favor of using a sys_off handler w/ SYS_OFF_MODE_POWER_OFF_PREPARE
Signed-off-by: Max Fierke <max@maxfierke.com>
---
...20x-add-clockworkpi-a06-power-support.patch | 18 ++++++++++++++----
PKGBUILD | 2 +-
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch b/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch
index fbd9dca..8bca2b7 100644
--- a/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch
+++ b/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch
@@ -14,25 +14,35 @@ diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index d90c45cd5..c2707fd00 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
-@@ -529,6 +529,12 @@ static const struct regmap_irq_chip rk81
+@@ -529,6 +529,14 @@ static const struct regmap_irq_chip rk81
static struct i2c_client *rk808_i2c_client;
-+static void rk808_pm_power_off_prepare(void)
++static int rk808_pm_power_off_prepare(struct sys_off_data *data)
+{
+ struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
+ regmap_update_bits(rk808->regmap, RK808_LDO_EN_REG, 0x08, 0x00);
++
++ return NOTIFY_DONE;
+}
+
static void rk808_pm_power_off(void)
{
int ret;
-@@ -771,6 +777,9 @@ static int rk808_probe(struct i2c_client
+@@ -771,6 +777,17 @@ static int rk808_probe(struct i2c_client
}
}
+ rk808_i2c_client = client;
-+ pm_power_off_prepare = rk808_pm_power_off_prepare;
++ ret = devm_register_sys_off_handler(&client->dev,
++ SYS_OFF_MODE_POWER_OFF_PREPARE,
++ SYS_OFF_PRIO_DEFAULT,
++ rk808_pm_power_off_prepare,
++ NULL);
++ if (ret) {
++ dev_warn(&client->dev, "failed to register sys-off handler: %d\n", ret);
++ return ret;
++ }
+
return 0;
diff --git a/PKGBUILD b/PKGBUILD
index ed427aa..824590c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@ md5sums=('f91bfe133d2cb1692f705947282e123a'
'9e6b7f44db105fef525d715213dce7cf'
'e2f08e3bc6d1b36e7000233abab1bfc7'
'8faf3d20b4c87cb05519e8ef56bfeaa6'
- 'f4895fa5b399dec785102f3a4a091175'
+ '3ce64f0b521cde07eeb82683a55663a0'
'f2577b39b1eda4a18b9111775843f83b'
'3203d018422505068fc22b909df871aa'
'690536056a80f05020ca5cd69edb0c77'
--
2.37.1
0001-clockworkpi-a06-Refactor-rk808-hack-to-use-sys_off-h.patch