提交 9e59c5f6 编写于 作者: F Finley Xiao 提交者: Heiko Stuebner

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

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: NFinley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: NElaine Zhang <zhangqing@rock-chips.com>
Reviewed-by: NUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: NHeiko Stuebner <heiko@sntech.de>
上级 60cc43fc
...@@ -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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册