mirror of
https://github.com/torvalds/linux.git
synced 2025-04-09 14:45:27 +00:00
pmdomain: Merge branch rockchip into next
Merge the immutable branch rockchip into next, to allow it to be tested together with the changes that are targeted for v6.15. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
commit
00fa8243e5
@ -572,9 +572,10 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd,
|
||||
}
|
||||
|
||||
/* Inform firmware to keep this pd on or off */
|
||||
arm_smccc_smc(ROCKCHIP_SIP_SUSPEND_MODE, ROCKCHIP_SLEEP_PD_CONFIG,
|
||||
pmu->info->pwr_offset + pd_pwr_offset,
|
||||
pd->info->pwr_mask, on, 0, 0, 0, &res);
|
||||
if (arm_smccc_1_1_get_conduit() != SMCCC_CONDUIT_NONE)
|
||||
arm_smccc_smc(ROCKCHIP_SIP_SUSPEND_MODE, ROCKCHIP_SLEEP_PD_CONFIG,
|
||||
pmu->info->pwr_offset + pd_pwr_offset,
|
||||
pd->info->pwr_mask, on, 0, 0, 0, &res);
|
||||
}
|
||||
|
||||
static int rockchip_pd_power(struct rockchip_pm_domain *pd, bool power_on)
|
||||
|
Loading…
x
Reference in New Issue
Block a user