[PATCH] Update PMU patch for 5.18
There's still a bunch weird going on with how this is all set up, and the hacks will need to be replaced for 5.19 or 5.20, but deferring that to later to unblock 5.18.
From 958863358767b42a08bf852710f1a213464b5d36 Mon Sep 17 00:00:00 2001
From: Max Fierke <max@maxfierke.com>
Date: Thu, 2 Jun 2022 22:37:26 -0500
Subject: [PATCH] Update PMU patch for 5.18
Signed-off-by: Max Fierke <max@maxfierke.com>
---
...0x-add-clockworkpi-a06-power-support.patch | 20 +++++++++----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch b/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch
index db0ed8b..fbd9dca 100644
--- a/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch
+++ b/0002-mfd-axp20x-add-clockworkpi-a06-power-support.patch
@@ -14,9 +14,9 @@ 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
-@@ -475,6 +475,12 @@ static void rk808_pm_power_off(void)
- dev_err(&rk808_i2c_client->dev, "Failed to shutdown device!\n");
- }
+@@ -529,6 +529,12 @@ static const struct regmap_irq_chip rk81
+
+ static struct i2c_client *rk808_i2c_client;
+static void rk808_pm_power_off_prepare(void)
+{
@@ -24,21 +24,19 @@ index d90c45cd5..c2707fd00 100644
+ regmap_update_bits(rk808->regmap, RK808_LDO_EN_REG, 0x08, 0x00);
+}
+
- static void rk8xx_shutdown(struct i2c_client *client)
+ static void rk808_pm_power_off(void)
{
- struct rk808 *rk808 = i2c_get_clientdata(client);
-@@ -641,9 +647,10 @@ static int rk808_probe(struct i2c_client *client,
+ int ret;
+@@ -771,6 +777,9 @@ static int rk808_probe(struct i2c_client
+ }
}
- if (of_property_read_bool(np, "rockchip,system-power-controller")) {
-- rk808_i2c_client = client;
- pm_power_off = rk808_pm_power_off;
- }
+ rk808_i2c_client = client;
+ pm_power_off_prepare = rk808_pm_power_off_prepare;
-
++
return 0;
+ err_irq:
diff --git a/drivers/power/supply/axp20x_ac_power.c b/drivers/power/supply/axp20x_ac_power.c
index ac360016b..c11024f3c 100644
--- a/drivers/power/supply/axp20x_ac_power.c
--
2.35.1