pmdomain: Merge branch rockchip into next

storulf · storulf · commit 00fa8243e572 · 2025-02-19T12:48:23.000+01:00
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 &lt;ulf.hansson@linaro.org&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -572,9 +572,10 @@ static void rockchip_do_pmu_set_power_domain(struct rockchip_pm_domain *pd,`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`/* Inform firmware to keep this pd on or off */`
`575`		`- arm_smccc_smc(ROCKCHIP_SIP_SUSPEND_MODE, ROCKCHIP_SLEEP_PD_CONFIG,`
`576`		`- pmu->info->pwr_offset + pd_pwr_offset,`
`577`		`- pd->info->pwr_mask, on, 0, 0, 0, &res);`
	`575`	`+ if (arm_smccc_1_1_get_conduit() != SMCCC_CONDUIT_NONE)`
	`576`	`+ arm_smccc_smc(ROCKCHIP_SIP_SUSPEND_MODE, ROCKCHIP_SLEEP_PD_CONFIG,`
	`577`	`+ pmu->info->pwr_offset + pd_pwr_offset,`
	`578`	`+ pd->info->pwr_mask, on, 0, 0, 0, &res);`
`578`	`579`	`}`
`579`	`580`
`580`	`581`	`static int rockchip_pd_power(struct rockchip_pm_domain *pd, bool power_on)`