Revert "MLK-25533-2 arm64: dts: imx8qm/qxp: add MP address into edma dts"

This reverts commit 121b0852e44855a559d6da424becf8a6f4e7a606.

11 files changed, 13 insertions, 26 deletions

diff --git a/arch/arm64/boot/dts/freescale/imx8dx-mek-dsp.dts b/arch/arm64/boot/dts/freescale/imx8dx-mek-dsp.dts
index d300f665c39d..953b510f8935 100644
--- a/arch/arm64/boot/dts/freescale/imx8dx-mek-dsp.dts
+++ b/arch/arm64/boot/dts/freescale/imx8dx-mek-dsp.dts
@@ -30,8 +30,7 @@
 
 &edma0 {
 	compatible = "fsl,imx8qm-edma";
-	reg = <0x591f0000 0x10000>,
-		<0x59280000 0x10000>, /* spdif0 rx */
+	reg = <0x59280000 0x10000>, /* spdif0 rx */
 		<0x59290000 0x10000>, /* spdif0 tx */
 		<0x592c0000 0x10000>, /* sai0 rx */
 		<0x592d0000 0x10000>, /* sai0 tx */
diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi b/arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi
index 33135ea7650e..7888d29a71b7 100644
--- a/arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi
@@ -53,8 +53,7 @@
 };
 
 &edma0 {
-	reg = <0x591f0000 0x10000>,
-		<0x59200000 0x10000>, /* asrc0 */
+	reg = <0x59200000 0x10000>, /* asrc0 */
 		<0x59210000 0x10000>,
 		<0x59220000 0x10000>,
 		<0x59230000 0x10000>,
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
index 9a6857bf0c18..123f5132af19 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
@@ -447,8 +447,7 @@
 
 	edma214: dma-controller@5a2e0000 {
 		compatible = "fsl,imx8qm-edma";
-		reg = <0x5a1f0000 0x10000>,
-		      <0x5a2e0000 0x10000>, /* channel14 UART1 rx */
+		reg = <0x5a2e0000 0x10000>, /* channel14 UART1 rx */
 		      <0x5a2f0000 0x10000>; /* channel15 UART1 tx */
 		#dma-cells = <3>;
 		dma-channels = <2>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts
index a621f443f90d..2dd8d4f031da 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-dsp.dts
@@ -30,8 +30,7 @@
 
 &edma0 {
 	compatible = "fsl,imx8qm-edma";
-	reg = <0x5a1f0000 0x10000>,
-		<0x59280000 0x10000>, /* spdif0 rx */
+	reg = <0x59280000 0x10000>, /* spdif0 rx */
 		<0x59290000 0x10000>, /* spdif0 tx */
 		<0x592c0000 0x10000>, /* sai0 rx */
 		<0x592d0000 0x10000>, /* sai0 tx */
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts
index 544eeaa1d721..3771bd238cd9 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts
@@ -46,8 +46,7 @@
 
 &edma0 {
 	compatible = "fsl,imx8qm-edma";
-	reg = <0x5a1f0000 0x10000>,
-		<0x59280000 0x10000>, /* spdif0 rx */
+	reg = <0x59280000 0x10000>, /* spdif0 rx */
 		<0x59290000 0x10000>, /* spdif0 tx */
 		<0x592c0000 0x10000>, /* sai0 rx */
 		<0x592d0000 0x10000>, /* sai0 tx */
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts
index b0695334f820..74fad00d89dc 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts
@@ -45,8 +45,7 @@
 
 &edma0 {
 	compatible = "fsl,imx8qm-edma";
-	reg = <0x591f0000 0x10000>,
-		<0x59280000 0x10000>, /* spdif0 rx */
+	reg = <0x59280000 0x10000>, /* spdif0 rx */
 		<0x59290000 0x10000>, /* spdif0 tx */
 		<0x592c0000 0x10000>, /* sai0 rx */
 		<0x592d0000 0x10000>, /* sai0 tx */
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
index bdf0166fcb84..708f21910053 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
@@ -12,8 +12,7 @@
 
 /* edma2 called in imx8qm RM with the same address in edma0 of imx8qxp */
 &edma0{
-	reg =   <0x591f0000 0x10000>,
-		<0x59200000 0x10000>, /* asrc0 */
+	reg =   <0x59200000 0x10000>, /* asrc0 */
 		<0x59210000 0x10000>,
 		<0x59220000 0x10000>,
 		<0x59230000 0x10000>,
@@ -98,8 +97,7 @@
 
 /* edma3 called in imx8qm RM with the same address in edma1 of imx8qxp */
 &edma1{
-	reg =   <0x599F0000 0x10000>,
-		<0x59A00000 0x10000>, /* asrc1 */
+	reg =   <0x59A00000 0x10000>, /* asrc1 */
 		<0x59A10000 0x10000>,
 		<0x59A20000 0x10000>,
 		<0x59A30000 0x10000>,
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
index b4eda76d435c..7ccb0ab7701d 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
@@ -111,8 +111,7 @@
 
 /* edma0 called in imx8qm RM with the same address in edma2 of imx8qxp */
 &edma2 {
-	reg = <0x5a1f0000 0x10000>,
-	      <0x5a200000 0x10000>, /* channel0 LPSPI0 rx */
+	reg = <0x5a200000 0x10000>, /* channel0 LPSPI0 rx */
 	      <0x5a210000 0x10000>, /* channel1 LPSPI0 tx */
 	      <0x5a220000 0x10000>, /* channel2 LPSPI1 rx */
 	      <0x5a230000 0x10000>, /* channel3 LPSPI1 tx */
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-xen.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-xen.dtsi
index 248952335f33..d5b720d2eba9 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-xen.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-xen.dtsi
@@ -263,8 +263,7 @@ dma_subsys: bus@5a000000 {
 	/* edma0 called in imx8qm RM with the same address in edma2 of imx8qxp */
 	edma214: dma-controller@5a2e0000 {
 		compatible = "fsl,imx8qm-edma";
-		reg = <0x5a1f0000 0x10000>,
-		      <0x5a2e0000 0x10000>, /* channel14 UART1 rx */
+		reg = <0x5a2e0000 0x10000>, /* channel14 UART1 rx */
 		      <0x5a2f0000 0x10000>; /* channel15 UART1 tx */
 		#dma-cells = <3>;
 		dma-channels = <2>;
@@ -282,8 +281,7 @@ dma_subsys: bus@5a000000 {
 };
 
 &edma2 {
-	reg = <0x5a1f0000 0x10000>,
-	      <0x5a200000 0x10000>, /* channel0 LPSPI0 rx */
+	reg = <0x5a200000 0x10000>, /* channel0 LPSPI0 rx */
 	      <0x5a210000 0x10000>, /* channel1 LPSPI0 tx */
 	      <0x5a260000 0x10000>, /* channel6 LPSPI3 rx */
 	      <0x5a270000 0x10000>, /* channel7 LPSPI3 tx */
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts
index 44fb20049fa7..03fbdd76c1b8 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-dsp.dts
@@ -30,8 +30,7 @@
 
 &edma0 {
 	compatible = "fsl,imx8qm-edma";
-	reg = <0x5a1f0000 0x10000>,
-		<0x59280000 0x10000>, /* spdif0 rx */
+	reg = <0x59280000 0x10000>, /* spdif0 rx */
 		<0x59290000 0x10000>, /* spdif0 tx */
 		<0x592c0000 0x10000>, /* sai0 rx */
 		<0x592d0000 0x10000>, /* sai0 tx */
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
index 1d63489da1e7..3afe5f4c4927 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
@@ -46,8 +46,7 @@
 
 &edma0 {
 	compatible = "fsl,imx8qm-edma";
-	reg = <0x5a1f0000 0x10000>,
-		<0x59280000 0x10000>, /* spdif0 rx */
+	reg = <0x59280000 0x10000>, /* spdif0 rx */
 		<0x59290000 0x10000>, /* spdif0 tx */
 		<0x592c0000 0x10000>, /* sai0 rx */
 		<0x592d0000 0x10000>, /* sai0 tx */