From 9e9a0e88a0f89b47b78162bb91d4d330a169e92b Mon Sep 17 00:00:00 2001
From: Shengjiu Wang <shengjiu.wang@nxp.com>
Date: Fri, 16 Jul 2021 13:51:54 +0800
Subject: [PATCH] LF-4175-7: arm64: dts: imx8ulp: 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>
---
arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 15 +++++----------
arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi | 5 -----
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
index 7bcebc3e6a80fa..022f9e0be2d057 100644
--- a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
@@ -150,19 +150,18 @@
spdif-out;
};
- sound-rpmsg {
- compatible = "fsl,imx-audio-rpmsg";
+ rpmsg_audio: rpmsg-audio {
+ compatible = "fsl,imx8ulp-rpmsg-audio";
model = "wm8960-audio";
- cpu-dai = <&rpmsg_i2s>;
+ fsl,rpmsg-out;
+ fsl,rpmsg-in;
audio-codec = <&wm8960>;
memory-region = <&audio_reserved>;
- rpmsg-out;
- rpmsg-in;
audio-routing =
"LINPUT1", "MICB",
"LINPUT3", "MICB";
+ status = "okay";
};
-
};
&dcnano {
@@ -590,10 +589,6 @@
};
-&rpmsg_i2s {
- status = "okay";
-};
-
&sai5 {
#sound-dai-cells = <0>;
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi b/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi
index ccda8883b1229d..5bc28fedc7b0d3 100644
--- a/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8ulp-rpmsg.dtsi
@@ -49,11 +49,6 @@
status = "okay";
};
- rpmsg_i2s: rpmsg-i2s {
- compatible = "fsl,imx8ulp-rpmsg-i2s";
- status = "disabled";
- };
-
tpm_rpchip_0: pwm {
compatible = "fsl,pwm-rpchip";
#pwm-cells = <3>;
--
GitLab