From bf3e03b257fbd5cb29d910eff9c3e5594f9bf51c Mon Sep 17 00:00:00 2001
From: Shengjiu Wang <shengjiu.wang@nxp.com>
Date: Fri, 16 Jul 2021 13:52:22 +0800
Subject: [PATCH] LF-4175-9: arm64: dts: imx8mn: update rpmsg audio nodes
Update rpmsg audio nodes to comply with upstreamed driver
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Peng Zhang <peng.zhang_8@nxp.com>
---
.../dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts | 18 +++++-------------
.../dts/freescale/imx8mn-ddr4-evk-rpmsg.dts | 18 +++++-------------
.../boot/dts/freescale/imx8mn-evk-rpmsg.dts | 18 +++++-------------
3 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
index f91b80c8112911..0bd9eb5d83b1e8 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk-rpmsg.dts
@@ -55,28 +55,20 @@
status = "disabled";
};
- rpmsg_i2s: rpmsg-i2s {
- compatible = "fsl,imx8mn-rpmsg-i2s";
- /* the audio device index in m4 domain */
- fsl,audioindex = <0> ;
- fsl,dma-buffer-size = <0x6000000>;
+ rpmsg_audio: rpmsg_audio {
+ compatible = "fsl,imx8mn-rpmsg-audio";
+ model = "wm8524-audio";
fsl,enable-lpa;
+ fsl,rpmsg-out;
clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
<&clk IMX8MN_CLK_SAI3_ROOT>,
<&clk IMX8MN_CLK_SDMA3_ROOT>,
<&clk IMX8MN_AUDIO_PLL1_OUT>,
<&clk IMX8MN_AUDIO_PLL2_OUT>;
- clock-names = "bus", "mclk", "dma", "pll8k", "pll11k";
+ clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k";
status = "okay";
};
- sound-rpmsg {
- compatible = "fsl,imx-audio-rpmsg";
- model = "wm8524-audio";
- cpu-dai = <&rpmsg_i2s>;
- rpmsg-out;
- };
-
imx8mn-cm7 {
compatible = "fsl,imx8mn-cm7";
rsc-da = <0xb8000000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
index 0d4fd5514d872f..608fe3e88c2e03 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk-rpmsg.dts
@@ -50,28 +50,20 @@
status = "disabled";
};
- rpmsg_i2s: rpmsg-i2s {
- compatible = "fsl,imx8mn-rpmsg-i2s";
- /* the audio device index in m4 domain */
- fsl,audioindex = <0> ;
- fsl,dma-buffer-size = <0x6000000>;
+ rpmsg_audio: rpmsg_audio {
+ compatible = "fsl,imx8mn-rpmsg-audio";
+ model = "wm8524-audio";
fsl,enable-lpa;
+ fsl,rpmsg-out;
clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
<&clk IMX8MN_CLK_SAI3_ROOT>,
<&clk IMX8MN_CLK_SDMA3_ROOT>,
<&clk IMX8MN_AUDIO_PLL1_OUT>,
<&clk IMX8MN_AUDIO_PLL2_OUT>;
- clock-names = "bus", "mclk", "dma", "pll8k", "pll11k";
+ clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k";
status = "okay";
};
- sound-rpmsg {
- compatible = "fsl,imx-audio-rpmsg";
- model = "wm8524-audio";
- cpu-dai = <&rpmsg_i2s>;
- rpmsg-out;
- };
-
imx8mn-cm7 {
compatible = "fsl,imx8mn-cm7";
rsc-da = <0xb8000000>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
index edb377899ead97..2c71397e0ec657 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mn-evk-rpmsg.dts
@@ -51,28 +51,20 @@
status = "disabled";
};
- rpmsg_i2s: rpmsg-i2s {
- compatible = "fsl,imx8mn-rpmsg-i2s";
- /* the audio device index in m4 domain */
- fsl,audioindex = <0> ;
- fsl,dma-buffer-size = <0x6000000>;
+ rpmsg_audio: rpmsg_audio {
+ compatible = "fsl,imx8mn-rpmsg-audio";
+ model = "wm8524-audio";
fsl,enable-lpa;
+ fsl,rpmsg-out;
clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
<&clk IMX8MN_CLK_SAI3_ROOT>,
<&clk IMX8MN_CLK_SDMA3_ROOT>,
<&clk IMX8MN_AUDIO_PLL1_OUT>,
<&clk IMX8MN_AUDIO_PLL2_OUT>;
- clock-names = "bus", "mclk", "dma", "pll8k", "pll11k";
+ clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k";
status = "okay";
};
- sound-rpmsg {
- compatible = "fsl,imx-audio-rpmsg";
- model = "wm8524-audio";
- cpu-dai = <&rpmsg_i2s>;
- rpmsg-out;
- };
-
imx8mn-cm7 {
compatible = "fsl,imx8mn-cm7";
rsc-da = <0xb8000000>;
--
GitLab