Skip to content

Commit 9b1ad4b

Browse files
committed
Merge tag 'pmdomain-v6.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
Pull pmdomain fix from Ulf Hansson: - imx: scu-pd: Correct the DMA2 channel * tag 'pmdomain-v6.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: pmdomain: imx: scu-pd: correct DMA2 channel
2 parents 82a040a + 767881c commit 9b1ad4b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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)