Commit 3902f60b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pmdomain-v6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm 

Pull pmdomain fixes from Ulf Hansson:

 - imx: Remove duplicated clocks for scu power domain

 - imx: Wait for SSAR to complete power-on for i.MX93 power domain

* tag 'pmdomain-v6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
  pmdomain: imx: wait SSAR when i.MX93 power domain on
  pmdomain: imx: scu-pd: Remove duplicated clocks
parents b78b25f6 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;

drivers/pmdomain/imx/scu-pd.c

+0 −5
Original line number Diff line number Diff line
@@ -223,11 +223,6 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { 
	{ "lvds1-pwm", IMX_SC_R_LVDS_1_PWM_0, 1, false, 0 },

	{ "lvds1-lpi2c", IMX_SC_R_LVDS_1_I2C_0, 2, true, 0 },



	{ "mipi1", IMX_SC_R_MIPI_1, 1, 0 },

	{ "mipi1-pwm0", IMX_SC_R_MIPI_1_PWM_0, 1, 0 },

	{ "mipi1-i2c", IMX_SC_R_MIPI_1_I2C_0, 2, 1 },

	{ "lvds1", IMX_SC_R_LVDS_1, 1, 0 },



	/* DC SS */

	{ "dc0", IMX_SC_R_DC_0, 1, false, 0 },

	{ "dc0-pll", IMX_SC_R_DC_0_PLL_0, 2, true, 0 },