arm64: dts: meson: vim3: enable hdmi audio loopback
Subsystems (2)
Jerome Brunet
reviewercover arm64: dts: meson: vim3: enable hdmi audio loopback
This patchset enable the hdmi audio loopback on the vim3 and vim3l. I found a few whitespace errors while doing it. This is sent along to avoid annoying conflicts.
Jerome Brunet (2):
arm64: dts: meson: vim3: whitespace fixups
arm64: dts: meson: vim3: enable hdmi audio loopback
.../boot/dts/amlogic/meson-khadas-vim3.dtsi | 60 ++++++++++++++----- 1 file changed, 46 insertions(+), 14 deletions(-)
Signature · 7 lines
2.28.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Jerome Brunet
reviewerPATCH 1/2 arm64: dts: meson: vim3: whitespace fixups
Spaces have been used to indent 2 nodes. Replace those with tabs and remove one extra newline
--- .../boot/dts/amlogic/meson-khadas-vim3.dtsi | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +9 -10
@@ -278,12 +278,12 @@ external_phy: ethernet-phy@0 { }; ðmac { - pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; - pinctrl-names = "default"; - status = "okay"; - phy-mode = "rgmii"; - phy-handle = <&external_phy>; - amlogic,tx-delay-ns = <2>; + pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; + pinctrl-names = "default"; + status = "okay"; + phy-mode = "rgmii"; + phy-handle = <&external_phy>; + amlogic,tx-delay-ns = <2>; }; &frddr_a {
@@ -349,9 +349,9 @@ &pcie { }; &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; + status = "okay"; + pinctrl-0 = <&pwm_e_pins>; + pinctrl-names = "default"; }; &saradc {
@@ -445,7 +445,6 @@ w25q128: spi-flash@0 { }; }; - &tdmif_a { status = "okay"; };
Signature · 7 lines
2.28.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Kevin Hilman
maintainerRe: [PATCH 1/2] arm64: dts: meson: vim3: whitespace fixups
Quoted 4 lines · Jerome Brunet
Spaces have been used to indent 2 nodes. Replace those with tabs and remove one extra newline
Signed-off-by Jerome Brunet <[email protected]>
Queued,
Thanks.
Kevin
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Jerome Brunet
reviewerPATCH 2/2 arm64: dts: meson: vim3: enable hdmi audio loopback
In reply to Jerome BrunetEnable audio capture frontends and a tdm decoder.
This makes it possible to loopback the audio played on the hdmi codec, which is the only output interface at the moment.
Of course, one TODDR device would be enough to do that but since the 3 FRDDRs are enabled on the playback side, let's do the same on the capture side.
--- .../boot/dts/amlogic/meson-khadas-vim3.dtsi | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +37 -4
@@ -166,11 +166,16 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,axg-sound-card"; model = "G12B-KHADAS-VIM3"; - audio-aux-devs = <&tdmout_a>; + audio-aux-devs = <&tdmin_a>, <&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"; + "TDM_A Playback", "TDMOUT_A OUT", + "TDMIN_A IN 1", "TDM_A Capture", + "TDMIN_A IN 3", "TDM_A Loopback", + "TODDR_A IN 0", "TDMIN_A OUT", + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT"; assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>,
@@ -193,8 +198,20 @@ dai-link-2 { sound-dai = <&frddr_c>; }; - /* 8ch hdmi interface */ dai-link-3 { + sound-dai = <&toddr_a>; + }; + + dai-link-4 { + sound-dai = <&toddr_b>; + }; + + dai-link-5 { + sound-dai = <&toddr_c>; + }; + + /* 8ch hdmi interface */ + dai-link-6 { sound-dai = <&tdmif_a>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>;
@@ -209,7 +226,7 @@ codec { }; /* hdmi glue */ - dai-link-4 { + dai-link-7 { sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; codec {
@@ -449,10 +466,26 @@ &tdmif_a { status = "okay"; }; +&tdmin_a { + status = "okay"; +}; + &tdmout_a { status = "okay"; }; +&toddr_a { + status = "okay"; +}; + +&toddr_b { + status = "okay"; +}; + +&toddr_c { + status = "okay"; +}; + &tohdmitx { status = "okay"; };
Signature · 7 lines
2.28.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Jerome Brunet
reviewerQuoted 19 lines · Jerome Brunet
Enable audio capture frontends and a tdm decoder.
This makes it possible to loopback the audio played on the hdmi codec, which is the only output interface at the moment.Of course, one TODDR device would be enough to do that but since the 3 FRDDRs are enabled on the playback side, let's do the same on the capture side.
Signed-off-by Jerome Brunet <[email protected]>--- .../boot/dts/amlogic/meson-khadas-vim3.dtsi | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-)arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +0
-0@@ -166,11 +166,16 @@ hdmi_connector_in: endpoint { sound {
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi hdmi_connector_in: endpoint { · line 174
Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +3
-2compatible = "amlogic,axg-sound-card"; model = "G12B-KHADAS-VIM3"; - audio-aux-devs = <&tdmout_a>; + audio-aux-devs = <&tdmin_a>, <&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"; + "TDM_A Playback", "TDMOUT_A OUT", + "TDMIN_A IN 1", "TDM_A Capture",
Oops this is wrong
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi hdmi_connector_in: endpoint { · line 175
Quoted 1 line
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +1
-0+ "TDMIN_A IN 3", "TDM_A Loopback",
And this correct for the vim3 but not the vim3l ... Please don't take this patch. Patch 1 can still be applied though.
Quoted 54 lines
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +26
-2+ "TODDR_A IN 0", "TDMIN_A OUT", + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT"; assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>,@@ -193,8 +198,20 @@ dai-link-2 { sound-dai = <&frddr_c>; }; - /* 8ch hdmi interface */ dai-link-3 { + sound-dai = <&toddr_a>; + }; + + dai-link-4 { + sound-dai = <&toddr_b>; + }; + + dai-link-5 { + sound-dai = <&toddr_c>; + }; + + /* 8ch hdmi interface */ + dai-link-6 { sound-dai = <&tdmif_a>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>;@@ -209,7 +226,7 @@ codec { }; /* hdmi glue */ - dai-link-4 { + dai-link-7 { sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; codec {@@ -449,10 +466,26 @@ &tdmif_a { status = "okay"; }; +&tdmin_a { + status = "okay"; +}; + &tdmout_a { status = "okay"; }; +&toddr_a { + status = "okay"; +}; + +&toddr_b {
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi &tdmif_a { · line 491
Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +7
-0+ status = "okay"; +}; + +&toddr_c { + status = "okay"; +}; + &tohdmitx { status = "okay"; };
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic