mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
This patch fixes shutdown power off issues on Rock Pi 4 and probably
|
|
all other boards using RK808 PMIC combined with PSCI.
|
|
|
|
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
|
|
index 601cefb5c..a57e4bb86 100644
|
|
--- a/drivers/mfd/rk808.c
|
|
+++ b/drivers/mfd/rk808.c
|
|
@@ -526,15 +526,24 @@ static void rk8xx_syscore_shutdown(void)
|
|
struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
|
|
int ret;
|
|
|
|
- if (system_state == SYSTEM_POWER_OFF &&
|
|
- (rk808->variant == RK809_ID || rk808->variant == RK817_ID)) {
|
|
- ret = regmap_update_bits(rk808->regmap,
|
|
- RK817_SYS_CFG(3),
|
|
- RK817_SLPPIN_FUNC_MSK,
|
|
- SLPPIN_DN_FUN);
|
|
- if (ret) {
|
|
- dev_warn(&rk808_i2c_client->dev,
|
|
- "Cannot switch to power down function\n");
|
|
+ if (system_state == SYSTEM_POWER_OFF) {
|
|
+ switch(rk808->variant) {
|
|
+ case RK809_ID:
|
|
+ case RK817_ID:
|
|
+ ret = regmap_update_bits(rk808->regmap,
|
|
+ RK817_SYS_CFG(3),
|
|
+ RK817_SLPPIN_FUNC_MSK,
|
|
+ SLPPIN_DN_FUN);
|
|
+ if (ret) {
|
|
+ dev_warn(&rk808_i2c_client->dev,
|
|
+ "Cannot switch to power down function\n");
|
|
+ }
|
|
+ break;
|
|
+ case RK808_ID:
|
|
+ rk808_device_shutdown();
|
|
+ break;
|
|
+ default:
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
@@ -616,7 +625,7 @@ static int rk808_probe(struct i2c_client *client,
|
|
nr_pre_init_regs = ARRAY_SIZE(rk808_pre_init_reg);
|
|
cells = rk808s;
|
|
nr_cells = ARRAY_SIZE(rk808s);
|
|
- rk808->pm_pwroff_fn = rk808_device_shutdown;
|
|
+ register_syscore_ops(&rk808_syscore_ops);
|
|
break;
|
|
case RK818_ID:
|
|
rk808->regmap_cfg = &rk818_regmap_config;
|