diff options
| author | Adrian Alonso <adrian.alonso@nxp.com> | 2022-04-19 14:57:09 -0500 |
|---|---|---|
| committer | Adrian Alonso <adrian.alonso@nxp.com> | 2022-05-12 09:14:49 -0500 |
| commit | 2ce79e966023bed8aee88f5553535a960249bb90 (patch) | |
| tree | cb00f226882c80d5bbfd4c27feba0baf12172b1e | |
| parent | a4f2c1b2fbebf934a4d94e590f18069391586bc2 (diff) | |
LF-5093-7: dts: arm64: freescale: imx8mm evk iqaudio dac update
Update device tree bindings to use fsl asoc parse
utils to handle audio hats with multiple codecs
Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacplus.dts | 17 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacpro.dts | 69 |
2 files changed, 15 insertions, 71 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacplus.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacplus.dts index 170db2331657..3a1ccd204a5a 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacplus.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacplus.dts @@ -24,9 +24,6 @@ sound-pcm512x { compatible = "fsl,imx-audio-pcm512x"; model = "pcm512x-audio"; - audio-cpu = <&sai5>; - audio-codec = <&pcm512x>; - format = "i2s"; audio-widgets = "Line", "Left Line Out Jack", "Line", "Right Line Out Jack"; @@ -34,6 +31,18 @@ "Left Line Out Jack", "OUTL", "Right Line Out Jack", "OUTR"; dac,24db_digital_gain; + + pri-dai-link { + link-name = "pcm512x-hifi"; + format = "i2s"; + cpu { + sound-dai = <&sai5>; + }; + + codec { + sound-dai = <&pcm512x>; + }; + }; }; }; @@ -56,6 +65,7 @@ AVDD-supply = <®_3v3_vext>; DVDD-supply = <®_3v3_vext>; CPVDD-supply = <®_3v3_vext>; + #sound-dai-cells = <0>; }; }; @@ -75,5 +85,6 @@ }; &sai5 { + #sound-dai-cells = <0>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacpro.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacpro.dts index 3d1398c1280b..ce99f4338cd2 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacpro.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk-iqaudio-dacpro.dts @@ -3,77 +3,10 @@ * Copyright 2020 NXP. */ -#include "imx8mm-evk.dts" - -/ { - reg_3v3_vext: regulator-3v3-vext { - compatible = "regulator-fixed"; - regulator-name = "3V3_VEXT"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - sound-ak4458 { - status = "disabled"; - }; - - sound-micfil { - status = "disabled"; - }; - - sound-pcm512x { - compatible = "fsl,imx-audio-pcm512x"; - model = "pcm512x-audio"; - audio-cpu = <&sai5>; - audio-codec = <&pcm512x>; - format = "i2s"; - audio-widgets = - "Line", "Left Line Out Jack", - "Line", "Right Line Out Jack"; - audio-routing = - "Left Line Out Jack", "OUTL", - "Right Line Out Jack", "OUTR"; - dac,24db_digital_gain; - }; -}; +#include "imx8mm-evk-iqaudio-dacplus.dts" &i2c3 { - ak4458_1: ak4458@10 { - status = "disabled"; - }; - - ak4458_2: ak4458@12 { - status = "disabled"; - }; - - ak4497: ak4497@11 { - status = "disabled"; - }; - pcm512x: pcm512x@4c { compatible = "ti,pcm5142"; - reg = <0x4c>; - AVDD-supply = <®_3v3_vext>; - DVDD-supply = <®_3v3_vext>; - CPVDD-supply = <®_3v3_vext>; }; }; - -&iomuxc { - pinctrl_sai5: sai5grp { - fsl,pins = < - MX8MM_IOMUXC_SAI5_RXD1_SAI5_TX_SYNC 0xd6 - MX8MM_IOMUXC_SAI5_RXD2_SAI5_TX_BCLK 0xd6 - MX8MM_IOMUXC_SAI5_RXD3_SAI5_TX_DATA0 0xd6 - MX8MM_IOMUXC_SAI5_RXD0_SAI5_RX_DATA0 0xd6 - >; - }; -}; - -&micfil { - status = "disabled"; -}; - -&sai5 { - status = "okay"; -}; |