| Message ID | 20230210122817.1027765-4-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: meson: gxbb-kii-pro: device-tree updates | expand |
On 10/02/2023 13:28, Christian Hewitt wrote: > Add initial support for HDMI and S/PDIF audio output. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > Tested-by: Ferass El Hafidi <vitali64pmemail@protonmail.com> > --- > .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 61 +++++++++++++++++++ > 1 file changed, 61 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts > index 435ae2aa404e..b6ee76011d82 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts > @@ -9,11 +9,19 @@ > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/leds/common.h> > +#include <dt-bindings/sound/meson-aiu.h> > > / { > compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; > model = "Videostrong KII Pro"; > > + spdif_dit: audio-codec-0 { > + #sound-dai-cells = <0>; > + compatible = "linux,spdif-dit"; > + status = "okay"; > + sound-name-prefix = "DIT"; > + }; > + > leds { > compatible = "gpio-leds"; > > @@ -35,6 +43,59 @@ button-reset { > gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; > }; > }; > + > + sound { > + compatible = "amlogic,gx-sound-card"; > + model = "KII-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"; Drop this 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_y_pins>; > + pinctrl-names = "default"; > }; > > ðmac { With that change: Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts index 435ae2aa404e..b6ee76011d82 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -9,11 +9,19 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/leds/common.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + leds { compatible = "gpio-leds"; @@ -35,6 +43,59 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "KII-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_y_pins>; + pinctrl-names = "default"; }; ðmac {