From e2420db5e03dfc2d654d1f8558bcd074a50b6b4d Mon Sep 17 00:00:00 2001 From: Shengjiu Wang <shengjiu.wang@nxp.com> Date: Fri, 16 Jul 2021 13:52:12 +0800 Subject: [PATCH] LF-4175-8: arm64: dts: imx8mp: 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> --- .../boot/dts/freescale/imx8mp-evk-rpmsg.dts | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts index cb3eaa9e507fdf..f2b8e66e7218d7 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-rpmsg.dts @@ -61,33 +61,26 @@ status = "disabled"; }; - rpmsg_i2s: rpmsg-i2s { - compatible = "fsl,imx8mp-rpmsg-i2s"; - /* the audio device index in m4 domain */ - fsl,audioindex = <0> ; - fsl,dma-buffer-size = <0x6000000>; + rpmsg_audio: rpmsg-audio { + compatible = "fsl,imx8mp-rpmsg-audio"; + model = "wm8960-audio"; fsl,enable-lpa; + fsl,rpmsg-out; clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_IPG>, <&audio_blk_ctrl IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1>, <&audio_blk_ctrl IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA3_ROOT>, <&clk IMX8MP_AUDIO_PLL1_OUT>, <&clk IMX8MP_AUDIO_PLL2_OUT>; - clock-names = "bus", "mclk", "dma", "pll8k", "pll11k"; - power-domains = <&audiomix_pd>; - status = "okay"; - }; - - sound-rpmsg { - compatible = "fsl,imx-audio-rpmsg"; - model = "wm8960-audio"; - cpu-dai = <&rpmsg_i2s>; + clock-names = "ipg", "mclk", "dma", "pll8k", "pll11k"; audio-codec = <&codec>; memory-region = <&audio_reserved>; - rpmsg-out; + power-domains = <&audiomix_pd>; audio-routing = "LINPUT1", "MICB", "LINPUT3", "MICB"; + status = "okay"; }; + imx8mp-cm7 { compatible = "fsl,imx8mn-cm7"; rsc-da = <0x55000000>; -- GitLab