Commit 971a5557 authored by Finley Xiao's avatar Finley Xiao Committed by Greg Kroah-Hartman

soc: rockchip: power-domain: Fix wrong value when power up pd with writemask

commit 9e59c5f6 upstream.

Solve the pd could only ever turn off but never turn them on again,
if the pd registers have the writemask bits.

So far this affects the rk3328 only.

Fixes: 79bb17ce ("soc: rockchip: power-domain: Support domain control in hiword-registers")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarFinley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: default avatarElaine Zhang <zhangqing@rock-chips.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56fbab60
...@@ -255,7 +255,7 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd, ...@@ -255,7 +255,7 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd,
return; return;
else if (pd->info->pwr_w_mask) else if (pd->info->pwr_w_mask)
regmap_write(pmu->regmap, pmu->info->pwr_offset, 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)); (pd->info->pwr_mask | pd->info->pwr_w_mask));
else else
regmap_update_bits(pmu->regmap, pmu->info->pwr_offset, regmap_update_bits(pmu->regmap, pmu->info->pwr_offset,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment