diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-19 12:48:23 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-19 12:48:23 +0100 |
| commit | 00fa8243e572e4d672edff61f4e7c8cb864b0e35 (patch) | |
| tree | 59da53ed9cb6b5aa10ed5e13eabbb6560b80d683 /drivers | |
| parent | cpuidle: psci: Add trace for PSCI domain idle (diff) | |
| parent | pmdomain: rockchip: Check if SMC could be handled by TA (diff) | |
| download | linux-00fa8243e572e4d672edff61f4e7c8cb864b0e35.tar.gz linux-00fa8243e572e4d672edff61f4e7c8cb864b0e35.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pmdomain/rockchip/pm-domains.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c index 49842f16f33d..27a5c68ff8ba 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c @@ -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) |