Commit 00fa8243 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 7b764483 61eeb967

drivers/pmdomain/rockchip/pm-domains.c

+4 −3
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd, 
	}



	/* Inform firmware to keep this pd on or off */

	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);