Commit 9b1ad4ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 82a040a8 767881c4

drivers/pmdomain/imx/scu-pd.c

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { 
	{ "mclk-out-1", IMX_SC_R_MCLK_OUT_1, 1, false, 0 },

	{ "dma0-ch", IMX_SC_R_DMA_0_CH0, 32, true, 0 },

	{ "dma1-ch", IMX_SC_R_DMA_1_CH0, 16, true, 0 },

	{ "dma2-ch", IMX_SC_R_DMA_2_CH0, 32, true, 0 },

	{ "dma2-ch-0", IMX_SC_R_DMA_2_CH0, 5, true, 0 },

	{ "dma2-ch-1", IMX_SC_R_DMA_2_CH5, 27, true, 0 },

	{ "dma3-ch", IMX_SC_R_DMA_3_CH0, 32, true, 0 },

	{ "asrc0", IMX_SC_R_ASRC_0, 1, false, 0 },

	{ "asrc1", IMX_SC_R_ASRC_1, 1, false, 0 },