From: Daniel Baluta <daniel.baluta@nxp.com>
Date: Mon, 2 Dec 2019 15:20:24 +0000 (+0200)
Subject: arm64: dts: Move mailbox description to generic DSP node
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~577^2~2^2~577
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=9ac3406b605614ded4c27ec7ada71b431dea1503;p=linux.git

arm64: dts: Move mailbox description to generic DSP node

This matches the upstream implementation.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof.dts
index ba0dc2e366ae..949c3d89588a 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof.dts
@@ -121,12 +121,6 @@
 	#sound-dai-cells = <0>;
 	compatible = "fsl,imx8qxp-dsp";
 	reg = <0x596e8000 0x88000>;
-	mbox-names = "txdb0", "txdb1",
-		"rxdb0", "rxdb1";
-	mboxes = <&lsio_mu13 2 0>,
-		<&lsio_mu13 2 1>,
-		<&lsio_mu13 3 0>,
-		<&lsio_mu13 3 1>;
 	memory-region = <&dsp_reserved>;
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
index 33662b72afff..1441dff20b31 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
@@ -59,6 +59,12 @@
 				<&pd IMX_SC_R_DSP>,
 				<&pd IMX_SC_R_DSP_RAM>,
 				<&pd IMX_SC_R_IRQSTR_DSP>;
+		mbox-names = "txdb0", "txdb1",
+			"rxdb0", "rxdb1";
+		mboxes = <&lsio_mu13 2 0>,
+			<&lsio_mu13 2 1>,
+			<&lsio_mu13 3 0>,
+			<&lsio_mu13 3 1>;
 		reserved-region = <&dsp_reserved>;
 		status = "disabled";
 	};