On Sat 18 Jul 2020 at 08:57, Christian Hewitt <christianshew...@gmail.com> wrote:
> Add initial support limited to HDMI i2s and SPDIF (LPCM). > > Signed-off-by: Christian Hewitt <christianshew...@gmail.com> > --- > .../boot/dts/amlogic/meson-gxm-rbox-pro.dts | 80 +++++++++++++++++++ > 1 file changed, 80 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts > b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts > index c89c9f846fb1..7b23b3da27ff 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts > @@ -14,6 +14,7 @@ > /dts-v1/; > > #include "meson-gxm.dtsi" > +#include <dt-bindings/sound/meson-aiu.h> > > / { > compatible = "kingnovel,r-box-pro", "amlogic,s912", "amlogic,meson-gxm"; > @@ -33,6 +34,13 @@ > reg = <0x0 0x0 0x0 0x80000000>; /* 2 GiB or 3 GiB */ > }; > > + spdif_dit: audio-codec-0 { > + #sound-dai-cells = <0>; > + compatible = "linux,spdif-dit"; > + status = "okay"; > + sound-name-prefix = "DIT"; > + }; > + > leds { > compatible = "gpio-leds"; > > @@ -51,6 +59,25 @@ > }; > }; > > + vddio_ao18: regulator-vddio_ao18 { > + compatible = "regulator-fixed"; > + regulator-name = "VDDIO_AO18"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + }; > + > + hdmi_5v: regulator-hdmi-5v { > + compatible = "regulator-fixed"; > + > + regulator-name = "HDMI_5V"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + > + gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + regulator-always-on; > + }; Same comment here ... > + > vddio_boot: regulator-vddio-boot { > compatible = "regulator-fixed"; > regulator-name = "VDDIO_BOOT"; > @@ -90,6 +117,59 @@ > clocks = <&wifi32k>; > clock-names = "ext_clock"; > }; > + > + sound { > + compatible = "amlogic,gx-sound-card"; > + model = "GXM-RBOX-PRO"; > + assigned-clocks = <&clkc CLKID_MPLL0>, > + <&clkc CLKID_MPLL1>, > + <&clkc CLKID_MPLL2>; > + assigned-clock-parents = <0>, <0>, <0>; > + assigned-clock-rates = <294912000>, > + <270950400>, > + <393216000>; > + status = "okay"; > + > + dai-link-0 { > + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; > + }; > + > + dai-link-1 { > + sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; > + }; > + > + dai-link-2 { > + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; > + dai-format = "i2s"; > + mclk-fs = <256>; > + > + codec-0 { > + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; > + }; > + }; > + > + dai-link-3 { > + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; > + > + codec-0 { > + sound-dai = <&spdif_dit>; > + }; > + }; > + > + dai-link-4 { > + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; > + > + codec-0 { > + sound-dai = <&hdmi_tx>; > + }; > + }; > + }; > +}; > + > +&aiu { > + status = "okay"; > + pinctrl-0 = <&spdif_out_h_pins>; > + pinctrl-names = "default"; > }; > > ðmac {