Skip to content

Commit

Permalink
arm64: dts: meson: add audio playback to khadas-vim3l
Browse files Browse the repository at this point in the history
Add initial audio support limited to HDMI i2s, copying the config
from the existing VIM3 device-tree.

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20200718072532.8427-3-christianshewitt@gmail.com
  • Loading branch information
chewitt authored and khilman committed Jul 21, 2020
1 parent 725da67 commit b8b85d0
Showing 1 changed file with 88 additions and 0 deletions.
88 changes: 88 additions & 0 deletions arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
Expand Up @@ -8,6 +8,7 @@

#include "meson-sm1.dtsi"
#include "meson-khadas-vim3.dtsi"
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>

/ {
compatible = "khadas,vim3l", "amlogic,sm1";
Expand All @@ -31,6 +32,69 @@
regulator-boot-on;
regulator-always-on;
};

sound {
compatible = "amlogic,axg-sound-card";
model = "SM1-KHADAS-VIM3L";
audio-aux-devs = <&tdmout_a>;
audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
"TDMOUT_A IN 1", "FRDDR_B OUT 0",
"TDMOUT_A IN 2", "FRDDR_C OUT 0",
"TDM_A Playback", "TDMOUT_A OUT";

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_a>;
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_A>;
};
};

/* hdmi glue */
dai-link-4 {
sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;

codec {
sound-dai = <&hdmi_tx>;
};
};
};
};

&arb {
status = "okay";
};

&clkc_audio {
status = "okay";
};

&cpu0 {
Expand Down Expand Up @@ -61,6 +125,18 @@
clock-latency = <50000>;
};

&frddr_a {
status = "okay";
};

&frddr_b {
status = "okay";
};

&frddr_c {
status = "okay";
};

&pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default";
Expand Down Expand Up @@ -93,3 +169,15 @@
phy-names = "usb2-phy0", "usb2-phy1";
};
*/

&tdmif_a {
status = "okay";
};

&tdmout_a {
status = "okay";
};

&tohdmitx {
status = "okay";
};

0 comments on commit b8b85d0

Please sign in to comment.