MLK-22284-3 ARM64: dts: freescale: imx8dx/qm: split dma channel power domain

Split dma channel power domain from sub-domain of dma customer driver
such as Audio, LPUART etc.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
index 9a68b69..e430afe 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
@@ -63,8 +63,32 @@ audio_subsys: bus@59000000 {
                                "edma0-chan8-rx", "edma0-chan9-tx", /* spdif0 */
                                "edma0-chan12-rx", "edma0-chan13-tx", /* sai0 */
                                "edma0-chan14-rx", "edma0-chan15-tx", /* sai1 */
-                               "edma0-chan21-tx",              /* gpt5 */
-                               "edma0-chan23-rx";              /* gpt7 */
+                               "edma0-chan21-tx",              /* gpt5 */
+                               "edma0-chan23-rx";              /* gpt7 */
+               power-domains = <&pd IMX_SC_R_DMA_0_CH0>,
+                               <&pd IMX_SC_R_DMA_0_CH1>,
+                               <&pd IMX_SC_R_DMA_0_CH2>,
+                               <&pd IMX_SC_R_DMA_0_CH3>,
+                               <&pd IMX_SC_R_DMA_0_CH4>,
+                               <&pd IMX_SC_R_DMA_0_CH5>,
+                               <&pd IMX_SC_R_DMA_0_CH6>,
+                               <&pd IMX_SC_R_DMA_0_CH7>,
+                               <&pd IMX_SC_R_DMA_0_CH8>,
+                               <&pd IMX_SC_R_DMA_0_CH9>,
+                               <&pd IMX_SC_R_DMA_0_CH12>,
+                               <&pd IMX_SC_R_DMA_0_CH13>,
+                               <&pd IMX_SC_R_DMA_0_CH14>,
+                               <&pd IMX_SC_R_DMA_0_CH15>,
+                               <&pd IMX_SC_R_DMA_0_CH21>,
+                               <&pd IMX_SC_R_DMA_0_CH23>;
+               power-domain-names = "edma0-chan0", "edma0-chan1",
+                                    "edma0-chan2", "edma0-chan3",
+                                    "edma0-chan4", "edma0-chan5",
+                                    "edma0-chan6", "edma0-chan7",
+                                    "edma0-chan8", "edma0-chan9",
+                                    "edma0-chan12", "edma0-chan13",
+                                    "edma0-chan14", "edma0-chan15",
+                                    "edma0-chan21", "edma0-chan23";
                status = "okay";
        };
 
@@ -96,6 +120,20 @@ audio_subsys: bus@59000000 {
                                "edma1-chan4-tx", "edma1-chan5-tx",
                                "edma1-chan8-rx", "edma1-chan9-tx", /* sai4 */
                                "edma1-chan10-tx";                 /* sai5 */
+               power-domains = <&pd IMX_SC_R_DMA_1_CH0>,
+                               <&pd IMX_SC_R_DMA_1_CH1>,
+                               <&pd IMX_SC_R_DMA_1_CH2>,
+                               <&pd IMX_SC_R_DMA_1_CH3>,
+                               <&pd IMX_SC_R_DMA_1_CH4>,
+                               <&pd IMX_SC_R_DMA_1_CH5>,
+                               <&pd IMX_SC_R_DMA_1_CH8>,
+                               <&pd IMX_SC_R_DMA_1_CH9>,
+                               <&pd IMX_SC_R_DMA_1_CH10>;
+               power-domain-names = "edma1-chan0", "edma1-chan1",
+                                    "edma1-chan2", "edma1-chan3",
+                                    "edma1-chan4", "edma1-chan5",
+                                    "edma1-chan8", "edma1-chan9",
+                                    "edma1-chan10";
                status = "okay";
        };
 
@@ -159,12 +197,6 @@ audio_subsys: bus@59000000 {
                fsl,asrc-rate  = <8000>;
                fsl,asrc-width = <16>;
                power-domains = <&pd IMX_SC_R_ASRC_0>,
-                               <&pd IMX_SC_R_DMA_0_CH0>,
-                               <&pd IMX_SC_R_DMA_0_CH1>,
-                               <&pd IMX_SC_R_DMA_0_CH2>,
-                               <&pd IMX_SC_R_DMA_0_CH3>,
-                               <&pd IMX_SC_R_DMA_0_CH4>,
-                               <&pd IMX_SC_R_DMA_0_CH5>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -184,8 +216,6 @@ audio_subsys: bus@59000000 {
                dmas = <&edma0 6 0 1>, <&edma0 7 0 0>;
                dma-names = "rx", "tx";
                power-domains = <&pd IMX_SC_R_ESAI_0>,
-                               <&pd IMX_SC_R_DMA_0_CH6>,
-                               <&pd IMX_SC_R_DMA_0_CH7>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -216,8 +246,6 @@ audio_subsys: bus@59000000 {
                dmas = <&edma0 8 0 5>, <&edma0 9 0 4>;
                dma-names = "rx", "tx";
                power-domains = <&pd IMX_SC_R_SPDIF_0>,
-                               <&pd IMX_SC_R_DMA_0_CH8>,
-                               <&pd IMX_SC_R_DMA_0_CH9>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -248,8 +276,6 @@ audio_subsys: bus@59000000 {
                dmas = <&edma0 10 0 5>, <&edma0 11 0 4>;
                dma-names = "rx", "tx";
                power-domains = <&pd IMX_SC_R_SPDIF_1>,
-                               <&pd IMX_SC_R_DMA_0_CH10>,
-                               <&pd IMX_SC_R_DMA_0_CH11>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -270,8 +296,6 @@ audio_subsys: bus@59000000 {
                dma-names = "rx", "tx";
                dmas = <&edma0 12 0 1>, <&edma0 13 0 0>;
                power-domains = <&pd IMX_SC_R_SAI_0>,
-                               <&pd IMX_SC_R_DMA_0_CH12>,
-                               <&pd IMX_SC_R_DMA_0_CH13>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -292,8 +316,6 @@ audio_subsys: bus@59000000 {
                dma-names = "rx", "tx";
                dmas = <&edma0 14 0 1>, <&edma0 15 0 0>;
                power-domains = <&pd IMX_SC_R_SAI_1>,
-                               <&pd IMX_SC_R_DMA_0_CH14>,
-                               <&pd IMX_SC_R_DMA_0_CH15>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -314,7 +336,6 @@ audio_subsys: bus@59000000 {
                dma-names = "rx";
                dmas = <&edma0 16 0 1>;
                power-domains = <&pd IMX_SC_R_SAI_2>,
-                               <&pd IMX_SC_R_DMA_0_CH16>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -335,7 +356,6 @@ audio_subsys: bus@59000000 {
                dma-names = "rx";
                dmas = <&edma0 17 0 1>;
                power-domains = <&pd IMX_SC_R_SAI_3>,
-                               <&pd IMX_SC_R_DMA_0_CH17>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -380,12 +400,6 @@ audio_subsys: bus@59000000 {
                fsl,asrc-rate  = <8000>;
                fsl,asrc-width = <16>;
                power-domains = <&pd IMX_SC_R_ASRC_1>,
-                               <&pd IMX_SC_R_DMA_1_CH0>,
-                               <&pd IMX_SC_R_DMA_1_CH1>,
-                               <&pd IMX_SC_R_DMA_1_CH2>,
-                               <&pd IMX_SC_R_DMA_1_CH3>,
-                               <&pd IMX_SC_R_DMA_1_CH4>,
-                               <&pd IMX_SC_R_DMA_1_CH5>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -406,8 +420,6 @@ audio_subsys: bus@59000000 {
                dma-names = "rx", "tx";
                dmas = <&edma1 8 0 1>, <&edma1 9 0 0>;
                power-domains = <&pd IMX_SC_R_SAI_4>,
-                               <&pd IMX_SC_R_DMA_1_CH8>,
-                               <&pd IMX_SC_R_DMA_1_CH9>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -428,7 +440,6 @@ audio_subsys: bus@59000000 {
                dma-names = "tx";
                dmas = <&edma1 10 0 0>;
                power-domains = <&pd IMX_SC_R_SAI_5>,
-                               <&pd IMX_SC_R_DMA_1_CH10>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
index 4cb11cd..6feb7d1 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
@@ -67,10 +67,8 @@ dma_subsys: bus@5a000000 {
                clock-names = "ipg", "baud";
                assigned-clocks = <&clk IMX_SC_R_UART_1 IMX_SC_PM_CLK_PER>;
                assigned-clock-rates = <80000000>;
-               power-domains = <&pd IMX_SC_R_UART_1>,
-                               <&pd IMX_SC_R_DMA_2_CH10>,
-                               <&pd IMX_SC_R_DMA_2_CH11>;
-               power-domain-names = "uart", "rxdma", "txdma";
+               power-domains = <&pd IMX_SC_R_UART_1>;
+               power-domain-names = "uart";
                dma-names = "tx","rx";
                dmas = <&edma2 11 0 0>,
                        <&edma2 10 0 1>;
@@ -85,10 +83,8 @@ dma_subsys: bus@5a000000 {
                clock-names = "ipg", "baud";
                assigned-clocks = <&clk IMX_SC_R_UART_2 IMX_SC_PM_CLK_PER>;
                assigned-clock-rates = <80000000>;
-               power-domains = <&pd IMX_SC_R_UART_2>,
-                               <&pd IMX_SC_R_DMA_2_CH12>,
-                               <&pd IMX_SC_R_DMA_2_CH13>;
-               power-domain-names = "uart", "rxdma", "txdma";
+               power-domains = <&pd IMX_SC_R_UART_2>;
+               power-domain-names = "uart";
                dma-names = "tx","rx";
                dmas = <&edma2 13 0 0>,
                        <&edma2 12 0 1>;
@@ -103,10 +99,8 @@ dma_subsys: bus@5a000000 {
                clock-names = "ipg", "baud";
                assigned-clocks = <&clk IMX_SC_R_UART_3 IMX_SC_PM_CLK_PER>;
                assigned-clock-rates = <80000000>;
-               power-domains = <&pd IMX_SC_R_UART_3>,
-                               <&pd IMX_SC_R_DMA_2_CH14>,
-                               <&pd IMX_SC_R_DMA_2_CH15>;
-               power-domain-names = "uart", "rxdma", "txdma";
+               power-domains = <&pd IMX_SC_R_UART_3>;
+               power-domain-names = "uart";
                dma-names = "tx","rx";
                dmas = <&edma2 15 0 0>,
                        <&edma2 14 0 1>;
@@ -152,6 +146,18 @@ dma_subsys: bus@5a000000 {
                                  "edma2-chan10-rx", "edma2-chan11-tx",
                                  "edma2-chan12-rx", "edma2-chan13-tx",
                                  "edma2-chan14-rx", "edma2-chan15-tx";
+               power-domains = <&pd IMX_SC_R_DMA_2_CH8>,
+                               <&pd IMX_SC_R_DMA_2_CH9>,
+                               <&pd IMX_SC_R_DMA_2_CH10>,
+                               <&pd IMX_SC_R_DMA_2_CH11>,
+                               <&pd IMX_SC_R_DMA_2_CH12>,
+                               <&pd IMX_SC_R_DMA_2_CH13>,
+                               <&pd IMX_SC_R_DMA_2_CH14>,
+                               <&pd IMX_SC_R_DMA_2_CH15>;
+               power-domain-names = "edma2-chan8", "edma2-chan9",
+                                    "edma2-chan10", "edma2-chan11",
+                                    "edma2-chan12", "edma2-chan13",
+                                    "edma2-chan14", "edma2-chan15";
                status = "disabled";
        };
 

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts
index 82e99de..f11e321 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts
@@ -54,6 +54,11 @@
                        "edma2-chan14-rx", "edma2-chan15-tx", /* sai1 */
                        "edma2-chan21-tx",              /* gpt5 */
                        "edma2-chan23-rx";              /* gpt7 */
+       pdomains = <&pd IMX_SC_R_DMA_2_CH8>, <&pd IMX_SC_R_DMA_2_CH9>,
+                  <&pd IMX_SC_R_DMA_2_CH12>, <&pd IMX_SC_R_DMA_2_CH13>,
+                  <&pd IMX_SC_R_DMA_2_CH14>, <&pd IMX_SC_R_DMA_2_CH15>,
+                  <&pd IMX_SC_R_DMA_2_CH21>,
+                  <&pd IMX_SC_R_DMA_2_CH23>;
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
index 39fbf02..72d5440 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
@@ -58,6 +58,33 @@
                        "edma2-chan12-rx", "edma2-chan13-tx", /* sai0 */
                        "edma2-chan14-rx", "edma2-chan15-tx", /* sai1 */
                        "edma2-chan18-rx", "edma2-chan19-tx"; /* sai4, sai5 */
+       power-domains = <&pd IMX_SC_R_DMA_2_CH0>,
+                       <&pd IMX_SC_R_DMA_2_CH1>,
+                       <&pd IMX_SC_R_DMA_2_CH2>,
+                       <&pd IMX_SC_R_DMA_2_CH3>,
+                       <&pd IMX_SC_R_DMA_2_CH4>,
+                       <&pd IMX_SC_R_DMA_2_CH5>,
+                       <&pd IMX_SC_R_DMA_2_CH6>,
+                       <&pd IMX_SC_R_DMA_2_CH7>,
+                       <&pd IMX_SC_R_DMA_2_CH8>,
+                       <&pd IMX_SC_R_DMA_2_CH9>,
+                       <&pd IMX_SC_R_DMA_2_CH10>,
+                       <&pd IMX_SC_R_DMA_2_CH11>,
+                       <&pd IMX_SC_R_DMA_2_CH12>,
+                       <&pd IMX_SC_R_DMA_2_CH13>,
+                       <&pd IMX_SC_R_DMA_2_CH14>,
+                       <&pd IMX_SC_R_DMA_2_CH15>,
+                       <&pd IMX_SC_R_DMA_2_CH18>,
+                       <&pd IMX_SC_R_DMA_2_CH19>;
+       power-domain-names = "edma2-chan0", "edma2-chan1",
+                            "edma2-chan2", "edma2-chan3",
+                            "edma2-chan4", "edma2-chan5",
+                            "edma2-chan6", "edma2-chan7",
+                            "edma2-chan8", "edma2-chan9",
+                            "edma2-chan10", "edma2-chan11",
+                            "edma2-chan12", "edma2-chan13",
+                            "edma2-chan14", "edma2-chan15",
+                            "edma2-chan18", "edma2-chan19";
 };
 
 /* edma3 called in imx8qm RM with the same address in edma1 of imx8qxp */
@@ -86,6 +113,20 @@
                        "edma3-chan4-tx", "edma3-chan5-tx",
                        "edma3-chan8-rx", "edma3-chan9-tx", /* sai6 */
                        "edma3-chan10-tx";                 /* sai7 */
+       power-domains = <&pd IMX_SC_R_DMA_3_CH0>,
+                       <&pd IMX_SC_R_DMA_3_CH1>,
+                       <&pd IMX_SC_R_DMA_3_CH2>,
+                       <&pd IMX_SC_R_DMA_3_CH3>,
+                       <&pd IMX_SC_R_DMA_3_CH4>,
+                       <&pd IMX_SC_R_DMA_3_CH5>,
+                       <&pd IMX_SC_R_DMA_3_CH8>,
+                       <&pd IMX_SC_R_DMA_3_CH9>,
+                       <&pd IMX_SC_R_DMA_3_CH10>;
+       power-domain-names = "edma3-chan0", "edma3-chan1",
+                            "edma3-chan2", "edma3-chan3",
+                            "edma3-chan4", "edma3-chan5",
+                            "edma3-chan8", "edma3-chan9",
+                            "edma3-chan10";
 };
 
 &asrc0 {
@@ -109,12 +150,6 @@
                <&clk_dummy>,
                <&clk_dummy>;
        power-domains = <&pd IMX_SC_R_ASRC_0>,
-                       <&pd IMX_SC_R_DMA_2_CH0>,
-                       <&pd IMX_SC_R_DMA_2_CH1>,
-                       <&pd IMX_SC_R_DMA_2_CH2>,
-                       <&pd IMX_SC_R_DMA_2_CH3>,
-                       <&pd IMX_SC_R_DMA_2_CH4>,
-                       <&pd IMX_SC_R_DMA_2_CH5>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -123,8 +158,6 @@
 
 &esai0 {
        power-domains = <&pd IMX_SC_R_ESAI_0>,
-                       <&pd IMX_SC_R_DMA_2_CH6>,
-                       <&pd IMX_SC_R_DMA_2_CH7>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -133,8 +166,6 @@
 
 &spdif0 {
        power-domains = <&pd IMX_SC_R_SPDIF_0>,
-                       <&pd IMX_SC_R_DMA_2_CH8>,
-                       <&pd IMX_SC_R_DMA_2_CH9>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -143,8 +174,6 @@
 
 &spdif1 {
        power-domains = <&pd IMX_SC_R_SPDIF_1>,
-                       <&pd IMX_SC_R_DMA_2_CH10>,
-                       <&pd IMX_SC_R_DMA_2_CH11>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -153,8 +182,6 @@
 
 &sai0 {
        power-domains = <&pd IMX_SC_R_SAI_0>,
-                       <&pd IMX_SC_R_DMA_2_CH12>,
-                       <&pd IMX_SC_R_DMA_2_CH13>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -163,8 +190,6 @@
 
 &sai1 {
        power-domains = <&pd IMX_SC_R_SAI_1>,
-                       <&pd IMX_SC_R_DMA_2_CH14>,
-                       <&pd IMX_SC_R_DMA_2_CH15>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -173,7 +198,6 @@
 
 &sai2 {
        power-domains = <&pd IMX_SC_R_SAI_2>,
-                       <&pd IMX_SC_R_DMA_2_CH16>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -182,7 +206,6 @@
 
 &sai3 {
        power-domains = <&pd IMX_SC_R_SAI_3>,
-                       <&pd IMX_SC_R_DMA_2_CH17>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -210,12 +233,6 @@
                <&clk_dummy>,
                <&clk_dummy>;
        power-domains = <&pd IMX_SC_R_ASRC_1>,
-                       <&pd IMX_SC_R_DMA_3_CH0>,
-                       <&pd IMX_SC_R_DMA_3_CH1>,
-                       <&pd IMX_SC_R_DMA_3_CH2>,
-                       <&pd IMX_SC_R_DMA_3_CH3>,
-                       <&pd IMX_SC_R_DMA_3_CH4>,
-                       <&pd IMX_SC_R_DMA_3_CH5>,
                        <&pd IMX_SC_R_AUDIO_CLK_0>,
                        <&pd IMX_SC_R_AUDIO_CLK_1>,
                        <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -340,7 +357,6 @@
                dmas = <&edma0 18 0 1>;
                fsl,dataline = <0 0xf 0x0>;
                power-domains = <&pd IMX_SC_R_SAI_4>,
-                               <&pd IMX_SC_R_DMA_2_CH18>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -362,7 +378,6 @@
                dmas = <&edma0 19 0 0>;
                fsl,dataline = <0 0x0 0xf>;
                power-domains = <&pd IMX_SC_R_SAI_5>,
-                               <&pd IMX_SC_R_DMA_2_CH19>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -382,8 +397,6 @@
                dmas = <&edma1 6 0 1>, <&edma1 7 0 0>;
                dma-names = "rx", "tx";
                power-domains = <&pd IMX_SC_R_ESAI_1>,
-                               <&pd IMX_SC_R_DMA_3_CH6>,
-                               <&pd IMX_SC_R_DMA_3_CH7>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -404,8 +417,6 @@
                dma-names = "rx", "tx";
                dmas = <&edma1 8 0 1>, <&edma1 9 0 0>;
                power-domains = <&pd IMX_SC_R_SAI_6>,
-                               <&pd IMX_SC_R_DMA_3_CH8>,
-                               <&pd IMX_SC_R_DMA_3_CH9>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,
@@ -426,7 +437,6 @@
                dma-names = "tx";
                dmas = <&edma1 10 0 0>;
                power-domains = <&pd IMX_SC_R_SAI_7>,
-                               <&pd IMX_SC_R_DMA_3_CH10>,
                                <&pd IMX_SC_R_AUDIO_CLK_0>,
                                <&pd IMX_SC_R_AUDIO_CLK_1>,
                                <&pd IMX_SC_R_AUDIO_PLL_0>,

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
index d81e175..b9b364b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
@@ -105,6 +105,27 @@
                          "edma0-chan16-rx", "edma0-chan17-tx",
                          "edma0-chan18-rx", "edma0-chan19-tx",
                          "edma0-chan20-rx", "edma0-chan21-tx";
+       power-domains = <&pd IMX_SC_R_DMA_0_CH0>,
+                       <&pd IMX_SC_R_DMA_0_CH1>,
+                       <&pd IMX_SC_R_DMA_0_CH6>,
+                       <&pd IMX_SC_R_DMA_0_CH7>,
+                       <&pd IMX_SC_R_DMA_0_CH12>,
+                       <&pd IMX_SC_R_DMA_0_CH13>,
+                       <&pd IMX_SC_R_DMA_0_CH14>,
+                       <&pd IMX_SC_R_DMA_0_CH15>,
+                       <&pd IMX_SC_R_DMA_0_CH16>,
+                       <&pd IMX_SC_R_DMA_0_CH17>,
+                       <&pd IMX_SC_R_DMA_0_CH18>,
+                       <&pd IMX_SC_R_DMA_0_CH19>,
+                       <&pd IMX_SC_R_DMA_0_CH20>,
+                       <&pd IMX_SC_R_DMA_0_CH21>;
+       power-domain-names = "edma0-chan0", "edma0-chan1",
+                            "edma0-chan6", "edma0-chan7",
+                            "edma0-chan12", "edma0-chan13",
+                            "edma0-chan14", "edma0-chan15",
+                            "edma0-chan16", "edma0-chan17",
+                            "edma0-chan18", "edma0-chan19",
+                            "edma0-chan20", "edma0-chan21";
        status = "okay";
 };
 
@@ -114,9 +135,7 @@
 
 &lpuart1 {
        compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart";
-       power-domains = <&pd IMX_SC_R_UART_1>,
-                       <&pd IMX_SC_R_DMA_0_CH14>,
-                       <&pd IMX_SC_R_DMA_0_CH15>;
+       power-domains = <&pd IMX_SC_R_UART_1>;
        dmas = <&edma2 15 0 0>,
               <&edma2 14 0 1>;
 };

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts
index 8add7e2..ee22953 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts
@@ -52,8 +52,20 @@
        interrupt-names = "edma0-chan8-rx", "edma0-chan9-tx", /* spdif0 */
                        "edma0-chan12-rx", "edma0-chan13-tx", /* sai0 */
                        "edma0-chan14-rx", "edma0-chan15-tx", /* sai1 */
-                       "edma0-chan21-tx",              /* gpt5 */
-                       "edma0-chan23-rx";              /* gpt7 */
+                       "edma0-chan21-tx",              /* gpt5 */
+                       "edma0-chan23-rx";              /* gpt7 */
+       power-domains = <&pd IMX_SC_R_DMA_0_CH8>,
+                       <&pd IMX_SC_R_DMA_0_CH9>,
+                       <&pd IMX_SC_R_DMA_0_CH12>,
+                       <&pd IMX_SC_R_DMA_0_CH13>,
+                       <&pd IMX_SC_R_DMA_0_CH14>,
+                       <&pd IMX_SC_R_DMA_0_CH15>,
+                       <&pd IMX_SC_R_DMA_0_CH21>,
+                       <&pd IMX_SC_R_DMA_0_CH23>;
+       power-domain-names = "edma0-chan8", "edma0-chan9",
+                            "edma0-chan12", "edma0-chan13",
+                            "edma0-chan14", "edma0-chan15",
+                            "edma0-chan21", "edma0-chan23";
        status = "okay";
 };