From: Daniel Baluta <daniel.baluta@nxp.com>
Date: Mon, 2 Dec 2019 15:03:28 +0000 (+0200)
Subject: arm64: dts: Do not override power-domains node of dsp
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~577^2~2^2~578
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=c3de9becfec83810df801442fbae5eae4c971feb;p=linux.git

arm64: dts: Do not override power-domains node of dsp

Because we've separated power domain enablement for DSP (DAI related
power-domains are now enabled in FSL DAI node) there is no need
to override power-domains node.

Note that IRQSTR_DSP power-domain was missing from initial dsp
description so add it now.

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 d3d64a1d2d2d..ba0dc2e366ae 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof.dts
@@ -121,11 +121,6 @@
 	#sound-dai-cells = <0>;
 	compatible = "fsl,imx8qxp-dsp";
 	reg = <0x596e8000 0x88000>;
-	power-domains = <&pd IMX_SC_R_MU_13A>,
-			<&pd IMX_SC_R_MU_13B>,
-			<&pd IMX_SC_R_IRQSTR_DSP>,
-			<&pd IMX_SC_R_DSP>,
-			<&pd IMX_SC_R_DSP_RAM>;
 	mbox-names = "txdb0", "txdb1",
 		"rxdb0", "rxdb1";
 	mboxes = <&lsio_mu13 2 0>,
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
index 6bc175608e26..33662b72afff 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
@@ -57,7 +57,8 @@
 		power-domains = <&pd IMX_SC_R_MU_13A>,
 				<&pd IMX_SC_R_MU_13B>,
 				<&pd IMX_SC_R_DSP>,
-				<&pd IMX_SC_R_DSP_RAM>;
+				<&pd IMX_SC_R_DSP_RAM>,
+				<&pd IMX_SC_R_IRQSTR_DSP>;
 		reserved-region = <&dsp_reserved>;
 		status = "disabled";
 	};