diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-15 13:51:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-15 13:51:10 -0700 |
| commit | 67a41cc86f372c418cef9af52993b1f6475b94ad (patch) | |
| tree | cc34e193d1c95c9877d3535220aecbfd83d009ca /drivers/soc | |
| parent | deae9088c58a580674449477294926a4b0aa4a34 (diff) | |
| parent | 9e59c5f66c624b43c766a9fe3b2430e0e976bf0e (diff) | |
| download | linux-67a41cc86f372c418cef9af52993b1f6475b94ad.tar.gz linux-67a41cc86f372c418cef9af52993b1f6475b94ad.tar.bz2 linux-67a41cc86f372c418cef9af52993b1f6475b94ad.zip | |
Merge tag 'v4.18-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/drivers
Fix for an issue introduced in 2016 where some powerdomains could only
be turned off but not on again.
* tag 'v4.18-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
soc: rockchip: power-domain: Fix wrong value when power up pd with writemask
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/rockchip/pm_domains.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 53efc386b1ad..df7f30a425c6 100644 --- a/drivers/soc/rockchip/pm_domains.c +++ b/drivers/soc/rockchip/pm_domains.c @@ -255,7 +255,7 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd, return; else if (pd->info->pwr_w_mask) regmap_write(pmu->regmap, pmu->info->pwr_offset, - on ? pd->info->pwr_mask : + on ? pd->info->pwr_w_mask : (pd->info->pwr_mask | pd->info->pwr_w_mask)); else regmap_update_bits(pmu->regmap, pmu->info->pwr_offset, |