diff options
author | J. Avila <elavila@google.com> | 2021-02-17 21:35:08 +0000 |
---|---|---|
committer | J. Avila <elavila@google.com> | 2021-02-17 21:35:08 +0000 |
commit | f55b7a81abfbd2eae3ab3ad990c5e52cf2dc456a (patch) | |
tree | fc18586800f0a6719dfba48709b96c70ba927bf1 | |
parent | eae8bebbe085da9d9266c9dea45467495400bc6b (diff) | |
parent | f9b3d860c4153ad3b8d6b715ddf6fae1c544daff (diff) | |
download | reset-f55b7a81abfbd2eae3ab3ad990c5e52cf2dc456a.tar.gz |
Merge partner/android-gs-pixel-mainline into partner/android-gs-pixel-5.10
* partner/android-gs-pixel-mainline:
power: reset: fix directly write to pmu_alive
Signed-off-by: J. Avila <elavila@google.com>
Bug: 180202410
Change-Id: I377bbbdae668a9d61a7e82b3a8e7d4dc35307141
-rw-r--r-- | exynos-reboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/exynos-reboot.c b/exynos-reboot.c index 310c052..c52dfcd 100644 --- a/exynos-reboot.c +++ b/exynos-reboot.c @@ -192,7 +192,7 @@ static int exynos_restart_handler(struct notifier_block *this, unsigned long mod } else { pr_emerg("Set PS_HOLD Low.\n"); mdelay(2); - regmap_update_bits(pmureg, cold_reboot_offset, cold_reboot_trigger, 0); + rmw_priv_reg(pmu_alive_base + cold_reboot_offset, cold_reboot_trigger, 0); } while (1) |