diff options
| author | Viorel Suman <viorel.suman@nxp.com> | 2020-03-09 14:01:00 +0200 |
|---|---|---|
| committer | Viorel Suman <viorel.suman@nxp.com> | 2020-03-10 11:08:35 +0200 |
| commit | 2bcdf92a47d0b1fcb33c4d3dd1331c6c883b1cdc (patch) | |
| tree | 84468f1dc68d5ceffe935d45e91e9f9876537446 /arch/arm64/boot/dts/freescale | |
| parent | fd3523b31e2546f430d5b00dec5ed13893be8574 (diff) | |
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>
Diffstat (limited to 'arch/arm64/boot/dts/freescale')
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mp-ab2.dts | 12 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp.dtsi | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-ab2.dts b/arch/arm64/boot/dts/freescale/imx8mp-ab2.dts index 9b2bab77f081..34099ffb27d7 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-ab2.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-ab2.dts @@ -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 diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts index 2d14d5b64fa7..cea868494f6c 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts @@ -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 diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index e0a6f4f5df2e..4ab89ca139ad 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -1303,14 +1303,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>, |