diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-08-05 13:27:17 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-08-05 13:27:17 +0200 |
| commit | 8287e9e2c7d26e9e3a6db2812fa8a1c6531b685e (patch) | |
| tree | 1296f4ada615d2611ab529b3fa001bd617cdf478 /drivers/pmdomain | |
| parent | cpuidle: psci: Enable the hierarchical topology for s2idle on PREEMPT_RT (diff) | |
| parent | pmdomain: imx: scu-pd: Remove duplicated clocks (diff) | |
| download | linux-8287e9e2c7d26e9e3a6db2812fa8a1c6531b685e.tar.xz linux-8287e9e2c7d26e9e3a6db2812fa8a1c6531b685e.zip | |
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: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/pmdomain')
| -rw-r--r-- | drivers/pmdomain/imx/scu-pd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pmdomain/imx/scu-pd.c b/drivers/pmdomain/imx/scu-pd.c index 05841b0bf7f3..01d465d88f60 100644 --- a/drivers/pmdomain/imx/scu-pd.c +++ b/drivers/pmdomain/imx/scu-pd.c @@ -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 }, |