Skip to content

Commit e8fa18d

Browse files
author
Ulf Hansson
committed
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.6-rc[n] into the next branch, to allow them to get tested together with the new pmdomain changes that are targeted for v6.7. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2 parents bc0d59d + 767881c commit e8fa18d

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/pmdomain/imx/scu-pd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = {
150150
{ "mclk-out-1", IMX_SC_R_MCLK_OUT_1, 1, false, 0 },
151151
{ "dma0-ch", IMX_SC_R_DMA_0_CH0, 32, true, 0 },
152152
{ "dma1-ch", IMX_SC_R_DMA_1_CH0, 16, true, 0 },
153-
{ "dma2-ch", IMX_SC_R_DMA_2_CH0, 32, true, 0 },
153+
{ "dma2-ch-0", IMX_SC_R_DMA_2_CH0, 5, true, 0 },
154+
{ "dma2-ch-1", IMX_SC_R_DMA_2_CH5, 27, true, 0 },
154155
{ "dma3-ch", IMX_SC_R_DMA_3_CH0, 32, true, 0 },
155156
{ "asrc0", IMX_SC_R_ASRC_0, 1, false, 0 },
156157
{ "asrc1", IMX_SC_R_ASRC_1, 1, false, 0 },

0 commit comments

Comments
 (0)