On Mon 16 Nov 2020 at 07:20, Christian Hewitt
wrote:
> Add initial audio support limited to HDMI i2s.
>
> Signed-off-by: Christian Hewitt
> ---
> .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 +--
> 1 file changed, 41 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> index bff8ec2c1c70..d4734220443c 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> @@ -7,9 +7,9 @@
>
> /dts-v1/;
>
> -#include
> -
> #include "meson-gxm.dtsi"
> +#include
> +#include
It's ok to do clean up or refactoring but it should not be done silently
or mixed with something unrelated
Same in the previous patch
>
> / {
> compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm";
> @@ -145,6 +145,45 @@
> clock-frequency = <32768>;
> pwms = <_ef 0 30518 0>; /* PWM_E at 32.768KHz */
> };
> +
> + sound {
> + compatible = "amlogic,gx-sound-card";
> + model = "GXM-KHADAS-VIM2";
> + assigned-clocks = < CLKID_MPLL0>,
> + < CLKID_MPLL1>,
> + < CLKID_MPLL2>;
> + assigned-clock-parents = <0>, <0>, <0>;
> + assigned-clock-rates = <294912000>,
> +<270950400>,
> +<393216000>;
> + status = "okay";
> +
> + dai-link-0 {
> + sound-dai = < AIU_CPU CPU_I2S_FIFO>;
> + };
> +
> + dai-link-1 {
> + sound-dai = < AIU_CPU CPU_I2S_ENCODER>;
> + dai-format = "i2s";
> + mclk-fs = <256>;
> +
> + codec-0 {
> + sound-dai = < AIU_HDMI CTRL_I2S>;
> + };
> + };
> +
> + dai-link-2 {
> + sound-dai = < AIU_HDMI CTRL_OUT>;
> +
> + codec-0 {
> + sound-dai = <_tx>;
> + };
> + };
> + };
> +};
> +
> + {
> + status = "okay";
> };
>
> _AO {
> @@ -154,7 +193,6 @@
> hdmi-phandle = <_tx>;
> };
>
> -
Same here
> _cooling_maps {
> map0 {
> cooling-device = <_fan THERMAL_NO_LIMIT 1>;
