diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
| commit | 0ea97d66df2a8b85698823b4d55d798a7870d7b5 (patch) | |
| tree | e4f36af1342ebcbcb5878e66b1e72661b6f2ca1d /drivers/soc/rockchip/pm_domains.c | |
| parent | eed41b9f413f40183095d27ffc94fb942fe18bb6 (diff) | |
| parent | 6183a1afdd2fb1c994e95af9d6db45f157241a04 (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.07-rt
Diffstat (limited to 'drivers/soc/rockchip/pm_domains.c')
| -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 40b75748835f..ba009bb9d82b 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, |