Skip to content

Commit 3902f60

Browse files
committed
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
2 parents b78b25f + 52dd070 commit 3902f60

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

drivers/pmdomain/imx/imx93-pd.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#define FUNC_STAT_PSW_STAT_MASK BIT(0)
2121
#define FUNC_STAT_RST_STAT_MASK BIT(2)
2222
#define FUNC_STAT_ISO_STAT_MASK BIT(4)
23+
#define FUNC_STAT_SSAR_STAT_MASK BIT(8)
2324

2425
struct imx93_power_domain {
2526
struct generic_pm_domain genpd;
@@ -50,7 +51,7 @@ static int imx93_pd_on(struct generic_pm_domain *genpd)
5051
writel(val, addr + MIX_SLICE_SW_CTRL_OFF);
5152

5253
ret = readl_poll_timeout(addr + MIX_FUNC_STAT_OFF, val,
53-
!(val & FUNC_STAT_ISO_STAT_MASK), 1, 10000);
54+
!(val & FUNC_STAT_SSAR_STAT_MASK), 1, 10000);
5455
if (ret) {
5556
dev_err(domain->dev, "pd_on timeout: name: %s, stat: %x\n", genpd->name, val);
5657
return ret;
@@ -72,7 +73,7 @@ static int imx93_pd_off(struct generic_pm_domain *genpd)
7273
writel(val, addr + MIX_SLICE_SW_CTRL_OFF);
7374

7475
ret = readl_poll_timeout(addr + MIX_FUNC_STAT_OFF, val,
75-
val & FUNC_STAT_PSW_STAT_MASK, 1, 1000);
76+
val & FUNC_STAT_PSW_STAT_MASK, 1, 10000);
7677
if (ret) {
7778
dev_err(domain->dev, "pd_off timeout: name: %s, stat: %x\n", genpd->name, val);
7879
return ret;

drivers/pmdomain/imx/scu-pd.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,6 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = {
223223
{ "lvds1-pwm", IMX_SC_R_LVDS_1_PWM_0, 1, false, 0 },
224224
{ "lvds1-lpi2c", IMX_SC_R_LVDS_1_I2C_0, 2, true, 0 },
225225

226-
{ "mipi1", IMX_SC_R_MIPI_1, 1, 0 },
227-
{ "mipi1-pwm0", IMX_SC_R_MIPI_1_PWM_0, 1, 0 },
228-
{ "mipi1-i2c", IMX_SC_R_MIPI_1_I2C_0, 2, 1 },
229-
{ "lvds1", IMX_SC_R_LVDS_1, 1, 0 },
230-
231226
/* DC SS */
232227
{ "dc0", IMX_SC_R_DC_0, 1, false, 0 },
233228
{ "dc0-pll", IMX_SC_R_DC_0_PLL_0, 2, true, 0 },

0 commit comments

Comments
 (0)