brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MLK-23566-1: arm64: dts: imx8mp: replace "earc" with "xcvr" 

IP module name is AUDIO XCVR, eARC being just one
of the audio interfaces supported by XCVR IP module.
Use IP module name instead of a specific audio interface
in order to avoid confusion.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 2bcdf92a47)
This commit is contained in:
Viorel Suman 2020-03-09 14:01:00 +02:00
parent 80840944c4
commit f9f5b52011
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/boot/dts/freescale/imx8mp-ab2.dts
View File

@ -68,10 +68,10 @@
cpu-dai = <&micfil>;
};
sound-earc {
sound-xcvr {
compatible = "fsl,imx-audio-xcvr";
model = "imx-audio-earc";
cpu-dai = <&earc>;
model = "imx-audio-xcvr";
cpu-dai = <&xcvr>;
};
sound-ak4458 {
@ -391,9 +391,9 @@
status = "okay";
};
&earc {
&xcvr {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_earc>;
pinctrl-0 = <&pinctrl_xcvr>;
/**
* Bit 0: TX enabled
* Bit 1: RX enabled
@ -615,7 +615,7 @@
>;
};
pinctrl_earc: earcgrp {
pinctrl_xcvr: xcvrgrp {
fsl,pins = <
MX8MP_IOMUXC_HDMI_DDC_SCL__HDMIMIX_EARC_SCL 0x400001c3
MX8MP_IOMUXC_HDMI_DDC_SDA__HDMIMIX_EARC_SDA 0x400001c3

8
arch/arm64/boot/dts/freescale/imx8mp-evk.dts
View File

@ -144,10 +144,10 @@
cpu-dai = <&micfil>;
};
sound-earc {
sound-xcvr {
compatible = "fsl,imx-audio-xcvr";
model = "imx-audio-earc";
cpu-dai = <&earc>;
model = "imx-audio-xcvr";
cpu-dai = <&xcvr>;
};
lvds_backlight: lvds_backlight {
@ -600,7 +600,7 @@
status = "okay";
};
&earc {
&xcvr {
/**
* Bit 0: TX enabled
* Bit 1: RX enabled

8
arch/arm64/boot/dts/freescale/imx8mp.dtsi
View File

@ -1300,14 +1300,14 @@
status = "disabled";
};
earc: earc@30cc0000 {
xcvr: xcvr@30cc0000 {
compatible = "fsl,imx8mp-xcvr";
reg = <0x30cc0000 0x10000>;
interrupts = /* eARC IRQ 0 */
interrupts = /* XCVR IRQ 0 */
<GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
/* eARC IRQ 1 */
/* XCVR IRQ 1 */
<GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
/* eARC PHY - SPDIF wakeup IRQ */
/* XCVR PHY - SPDIF wakeup IRQ */
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_IPG>,
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_PHY>,