| Message ID | 20201116062031.11233-4-christianshewitt@gmail.com |
|---|---|
| State | Accepted |
| Commit | 0157e1a63c7685dfeee4e7cfd22635ebf104f64f |
| Headers | show |
| Series | [v3,1/7] arm64: dts: meson: add audio playback to a95x | expand |
On Mon 16 Nov 2020 at 07:20, Christian Hewitt <christianshewitt@gmail.com> wrote: > Add initial audio support limited to HDMI i2s. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > .../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 <dt-bindings/input/input.h> > - > #include "meson-gxm.dtsi" > +#include <dt-bindings/input/input.h> > +#include <dt-bindings/sound/meson-aiu.h> 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 = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ > }; > + > + sound { > + compatible = "amlogic,gx-sound-card"; > + model = "GXM-KHADAS-VIM2"; > + 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_I2S_ENCODER>; > + dai-format = "i2s"; > + mclk-fs = <256>; > + > + codec-0 { > + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; > + }; > + }; > + > + dai-link-2 { > + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; > + > + codec-0 { > + sound-dai = <&hdmi_tx>; > + }; > + }; > + }; > +}; > + > +&aiu { > + status = "okay"; > }; > > &cec_AO { > @@ -154,7 +193,6 @@ > hdmi-phandle = <&hdmi_tx>; > }; > > - Same here > &cpu_cooling_maps { > map0 { > cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>;
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 <dt-bindings/input/input.h> - #include "meson-gxm.dtsi" +#include <dt-bindings/input/input.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm"; @@ -145,6 +145,45 @@ clock-frequency = <32768>; pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXM-KHADAS-VIM2"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO { @@ -154,7 +193,6 @@ hdmi-phandle = <&hdmi_tx>; }; - &cpu_cooling_maps { map0 { cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>;
Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-)