Commit bca1c19f authored by Ulf Hansson's avatar Ulf Hansson
Browse files

pmdomain: Merge branch fixes into next 



Merge the pmdomain fixes for v6.11-rc[n] into the next branch, to allow them
to get tested together with the new changes that are targeted for v6.12.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 562cdead 52dd070c

drivers/pmdomain/imx/imx93-pd.c

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define FUNC_STAT_PSW_STAT_MASK		BIT(0)

#define FUNC_STAT_RST_STAT_MASK		BIT(2)

#define FUNC_STAT_ISO_STAT_MASK		BIT(4)

#define FUNC_STAT_SSAR_STAT_MASK	BIT(8)



struct imx93_power_domain {

	struct generic_pm_domain genpd;
@@ -50,7 +51,7 @@ static int imx93_pd_on(struct generic_pm_domain *genpd) 
	writel(val, addr + MIX_SLICE_SW_CTRL_OFF);



	ret = readl_poll_timeout(addr + MIX_FUNC_STAT_OFF, val,

				 !(val & FUNC_STAT_ISO_STAT_MASK), 1, 10000);

				 !(val & FUNC_STAT_SSAR_STAT_MASK), 1, 10000);

	if (ret) {

		dev_err(domain->dev, "pd_on timeout: name: %s, stat: %x\n", genpd->name, val);

		return ret;
@@ -72,7 +73,7 @@ static int imx93_pd_off(struct generic_pm_domain *genpd) 
	writel(val, addr + MIX_SLICE_SW_CTRL_OFF);



	ret = readl_poll_timeout(addr + MIX_FUNC_STAT_OFF, val,

				 val & FUNC_STAT_PSW_STAT_MASK, 1, 1000);

				 val & FUNC_STAT_PSW_STAT_MASK, 1, 10000);

	if (ret) {

		dev_err(domain->dev, "pd_off timeout: name: %s, stat: %x\n", genpd->name, val);

		return ret;