From: Daniel Baluta <daniel.baluta@nxp.com>
Date: Wed, 1 Jul 2020 16:11:34 +0000 (+0300)
Subject: arm64: dts: imx8qxp-sof-wm8960: Remove FSL DAI generic node
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~577^2~2^2~398
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=a8fa5233e02b33eb908ca148a6a5f13a3e8224be;p=linux.git

arm64: dts: imx8qxp-sof-wm8960: Remove FSL DAI generic node

This removes FSL DAI generic node as suggested by upstream
community review and move resources handling for DAIs under
DSP platform node.

So, pinctrl, power domains and clocks are now under dsp node.

Notice that, now DAI links looks like this:
    cpu {
        sound-dai = <&dsp 1>;
    };
    codec {
	sound-dai = <&wm8960>;
    };

See how CPU sound-dai gets an additional CELL for DAI index as
defined by the array imx8_dai from sound/soc/sof/imx/imx8.c

Here we need SAI1 index which is 1.

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

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 6770aff6538a..c95b9d0aa434 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts
@@ -12,34 +12,6 @@
 		status = "disabled";
 	};
 
-	sai1_port: sai-port {
-		#sound-dai-cells = <0>;
-		compatible = "fsl,sai-dai";
-
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_sai1>;
-
-		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>,
-			<&pd IMX_SC_R_AUDIO_PLL_1>;
-
-		clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
-		clocks = <&sai1_lpcg 1>, <&clk_dummy>, <&sai1_lpcg 0>,
-			<&clk_dummy>, <&clk_dummy>;
-		assigned-clocks = <&acm IMX_ADMA_ACM_SAI1_MCLK_SEL>,
-				<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>,
-				<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC0>,
-				<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC1>,
-				<&sai1_lpcg 0>; /* FIXME: should be sai1, original code is 0 */
-		assigned-clock-parents = <&aud_pll_div0_lpcg 0>;
-		assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>;
-		status="okay";
-	};
-
 	sof-sound-wm8960 {
 		compatible = "simple-audio-card";
 		label = "wm8960-audio";
@@ -67,10 +39,7 @@
 		simple-audio-card,dai-link {
 			format = "i2s";
 			cpu {
-				sound-dai = <&sai1_port>;
-			};
-			plat {
-				sound-dai = <&dsp>;
+				sound-dai = <&dsp 1>;
 			};
 			sndcodec: codec {
 				sound-dai = <&wm8960>;
@@ -114,9 +83,39 @@
 };
 
 &dsp {
-	#sound-dai-cells = <0>;
+	#sound-dai-cells = <1>;
 	compatible = "fsl,imx8qxp-dsp";
 	reg = <0x596e8000 0x88000>;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai1>;
+
+	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_IRQSTR_DSP>,
+		<&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>,
+		<&pd IMX_SC_R_AUDIO_PLL_1>;
+
+	clock-names = "ipg", "ocram", "core",
+		"sai1_bus", "sai1_mclk0", "sai1_mclk1", "sai1_mclk2", "sai1_mclk3";
+	clocks = <&dsp_lpcg 1>, <&dsp_ram_lpcg 0>, <&dsp_lpcg 2>,
+		<&sai1_lpcg 1>, <&clk_dummy>, <&sai1_lpcg 0>,
+		<&clk_dummy>, <&clk_dummy>;
+	assigned-clocks = <&acm IMX_ADMA_ACM_SAI1_MCLK_SEL>,
+			<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>,
+			<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC0>,
+			<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MISC1>,
+			<&sai1_lpcg 0>; /* FIXME: should be sai1, original code is 0 */
+	assigned-clock-parents = <&aud_pll_div0_lpcg 0>;
+	assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>;
+
 	tplg-name = "sof-imx8qxp-wm8960.tplg";
 	machine-drv-name = "asoc-simple-card";
 	status = "okay";