diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-12 11:34:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-12 11:34:23 -0700 |
| commit | 9b1ad4ba57688ae8eb0d3bbe63c13dbd9854357a (patch) | |
| tree | af039f33df7f190f48b2d98bb2f1297bc1e14279 | |
| parent | 82a040a8fa9b4f3845eff73a69a9931a59335902 (diff) | |
| parent | 767881c470b3140c33795031c4e4d65572731c1c (diff) | |
| download | linux-riscv-keystone-9b1ad4ba57688ae8eb0d3bbe63c13dbd9854357a.tar.gz | |
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
| -rw-r--r-- | drivers/pmdomain/imx/scu-pd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pmdomain/imx/scu-pd.c b/drivers/pmdomain/imx/scu-pd.c index 2f693b67ddb4a9..891c1d925a9dea 100644 --- a/drivers/pmdomain/imx/scu-pd.c +++ b/drivers/pmdomain/imx/scu-pd.c @@ -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 }, |