Commit 67a41cc8 authored May 15, 2018 by Olof Johansson

Merge tag 'v4.18-rockchip-drivers-1' of...

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>

parents deae9088 9e59c5f6

drivers/soc/rockchip/pm_domains.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,