Commit 8287e9e2 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 1c4b2932 50359c9c

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 },