On Sun 19 Jul 2020 at 04:45, Christian Hewitt <christianshew...@gmail.com> wrote:
> Add initial support limited to HDMI i2s and S/PDIF (LPCM). Nack. #1. Same comment as before on spdifout B and SPDIF HDMI input. #2. the u200 is a special reference device with 2 onboards codecs, external connector for audio daugther boards and internal codec. I don't see another board using that configuration, which would make them incompatible #3. TDM B is a bad choice on this board as it connected to one of the i2s codecs of the board, which won't take 4 lines ine. > > Signed-off-by: Christian Hewitt <christianshew...@gmail.com> > --- > .../boot/dts/amlogic/meson-g12a-u200.dts | 131 ++++++++++++++++++ > 1 file changed, 131 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > index a26bfe72550f..dde7e258a184 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts > @@ -8,6 +8,7 @@ > #include "meson-g12a.dtsi" > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/gpio/meson-g12a-gpio.h> > +#include <dt-bindings/sound/meson-g12a-tohdmitx.h> > > / { > compatible = "amlogic,u200", "amlogic,g12a"; > @@ -18,6 +19,13 @@ > ethernet0 = ðmac; > }; > > + spdif_dit: audio-codec-1 { > + #sound-dai-cells = <0>; > + compatible = "linux,spdif-dit"; > + status = "okay"; > + sound-name-prefix = "DIT"; > + }; > + > chosen { > stdout-path = "serial0:115200n8"; > }; > @@ -147,6 +155,91 @@ > regulator-boot-on; > regulator-always-on; > }; > + > + > + sound { > + compatible = "amlogic,axg-sound-card"; > + model = "G12A-U200"; > + audio-aux-devs = <&tdmout_b>; > + audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", > + "TDMOUT_B IN 1", "FRDDR_B OUT 1", > + "TDMOUT_B IN 2", "FRDDR_C OUT 1", > + "TDM_B Playback", "TDMOUT_B OUT", > + "SPDIFOUT IN 0", "FRDDR_A OUT 3", > + "SPDIFOUT IN 1", "FRDDR_B OUT 3", > + "SPDIFOUT IN 2", "FRDDR_C OUT 3"; > + > + assigned-clocks = <&clkc CLKID_MPLL2>, > + <&clkc CLKID_MPLL0>, > + <&clkc CLKID_MPLL1>; > + assigned-clock-parents = <0>, <0>, <0>; > + assigned-clock-rates = <294912000>, > + <270950400>, > + <393216000>; > + status = "okay"; > + > + dai-link-0 { > + sound-dai = <&frddr_a>; > + }; > + > + dai-link-1 { > + sound-dai = <&frddr_b>; > + }; > + > + dai-link-2 { > + sound-dai = <&frddr_c>; > + }; > + > + /* 8ch hdmi interface */ > + dai-link-3 { > + sound-dai = <&tdmif_b>; > + dai-format = "i2s"; > + dai-tdm-slot-tx-mask-0 = <1 1>; > + dai-tdm-slot-tx-mask-1 = <1 1>; > + dai-tdm-slot-tx-mask-2 = <1 1>; > + dai-tdm-slot-tx-mask-3 = <1 1>; > + mclk-fs = <256>; > + > + codec { > + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; > + }; > + }; > + > + /* spdif hdmi or toslink interface */ > + dai-link-4 { > + sound-dai = <&spdifout>; > + > + codec-0 { > + sound-dai = <&spdif_dit>; > + }; > + > + codec-1 { > + sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_A>; > + }; > + }; > + > + /* spdif hdmi interface */ > + dai-link-5 { > + sound-dai = <&spdifout_b>; > + > + codec { > + sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_B>; > + }; > + }; > + > + /* hdmi glue */ > + dai-link-6 { > + sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; > + > + codec { > + sound-dai = <&hdmi_tx>; > + }; > + }; > + }; > +}; > + > +&arb { > + status = "okay"; > }; > > &cec_AO { > @@ -163,6 +256,10 @@ > hdmi-phandle = <&hdmi_tx>; > }; > > +&clkc_audio { > + status = "okay"; > +}; > + > &cpu0 { > cpu-supply = <&vddcpu>; > operating-points-v2 = <&cpu_opp_table>; > @@ -203,6 +300,18 @@ > phy-mode = "rmii"; > }; > > +&frddr_a { > + status = "okay"; > +}; > + > +&frddr_b { > + status = "okay"; > +}; > + > +&frddr_c { > + status = "okay"; > +}; > + > &hdmi_tx { > status = "okay"; > pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; > @@ -288,6 +397,28 @@ > vqmmc-supply = <&flash_1v8>; > }; > > +&spdifout { > + pinctrl-0 = <&spdif_out_h_pins>; > + pinctrl-names = "default"; > + status = "okay"; > +}; > + > +&spdifout_b { > + status = "okay"; > +}; > + > +&tdmif_b { > + status = "okay"; > +}; > + > +&tdmout_b { > + status = "okay"; > +}; > + > +&tohdmitx { > + status = "okay"; > +}; > + > &uart_AO { > status = "okay"; > pinctrl-0 = <&uart_ao_a_pins>;