[PATCH 0/3] arm64: dts: amlogic: add more basic audio support

[PATCH 0/3] arm64: dts: amlogic: add more basic audio support

[Christian Hewitt]

This mini-series adds basic audio support to the P200/P201 (GXBB) and U200 (G12A)
reference boards. Few people likely have the original reference boards which have
extra audio capabilities, but the device-trees are widely [ab]used by users with
Android set-top boxes whose hardware is copy/pasted from the reference designs to
get working installs. Adding basic audio support does no harm to the real boards
and helps the secondary cause.

Christian Hewitt (3):
  arm64: dts: meson: add audio playback to p200
  arm64: dts: meson: add audio playback to p201
  arm64: dts: meson: add audio playback to u200

 .../boot/dts/amlogic/meson-g12a-u200.dts      | 129 ++++++++++++++++++
 .../boot/dts/amlogic/meson-gxbb-p200.dts      |  60 ++++++++
 .../boot/dts/amlogic/meson-gxbb-p201.dts      |  39 ++++++
 3 files changed, 228 insertions(+)

-- 
2.34.1

[PATCH 1/3] arm64: dts: meson: add audio playback to p200

[Christian Hewitt]

Add initial support limited to HDMI i2s and SPDIF (LPCM).

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 .../boot/dts/amlogic/meson-gxbb-p200.dts      | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 3c93d1898b40..292c718ee19c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -9,11 +9,19 @@
 
 #include "meson-gxbb-p20x.dtsi"
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/sound/meson-aiu.h>
 
 / {
 	compatible = "amlogic,p200", "amlogic,meson-gxbb";
 	model = "Amlogic Meson GXBB P200 Development Board";
 
+	spdif_dit: audio-codec-0 {
+		#sound-dai-cells = <0>;
+		compatible = "linux,spdif-dit";
+		status = "okay";
+		sound-name-prefix = "DIT";
+	};
+
 	avdd18_usb_adc: regulator-avdd18_usb_adc {
 		compatible = "regulator-fixed";
 		regulator-name = "AVDD18_USB_ADC";
@@ -57,6 +65,58 @@ button-menu {
 			press-threshold-microvolt = <0>; /* 0% */
 		};
 	};
+
+	sound {
+		compatible = "amlogic,gx-sound-card";
+		model = "P200";
+		assigned-clocks = <&clkc CLKID_MPLL0>,
+				  <&clkc CLKID_MPLL1>,
+				  <&clkc CLKID_MPLL2>;
+		assigned-clock-parents = <0>, <0>, <0>;
+		assigned-clock-rates = <294912000>,
+				       <270950400>,
+				       <393216000>;
+
+		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";
 };
 
 &ethmac {
-- 
2.34.1

[PATCH 2/3] arm64: dts: meson: add audio playback to p201

[Christian Hewitt]

Add initial audio support limited to HDMI i2s.

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 .../boot/dts/amlogic/meson-gxbb-p201.dts      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
index 150a82f3b2d7..6f81eed83bec 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
@@ -8,10 +8,49 @@
 /dts-v1/;
 
 #include "meson-gxbb-p20x.dtsi"
+#include <dt-bindings/sound/meson-aiu.h>
 
 / {
 	compatible = "amlogic,p201", "amlogic,meson-gxbb";
 	model = "Amlogic Meson GXBB P201 Development Board";
+
+	sound {
+		compatible = "amlogic,gx-sound-card";
+		model = "P201";
+		assigned-clocks = <&clkc CLKID_MPLL0>,
+				  <&clkc CLKID_MPLL1>,
+				  <&clkc CLKID_MPLL2>;
+		assigned-clock-parents = <0>, <0>, <0>;
+		assigned-clock-rates = <294912000>,
+				       <270950400>,
+				       <393216000>;
+
+		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";
 };
 
 &ethmac {
-- 
2.34.1

[PATCH 3/3] arm64: dts: meson: add audio playback to u200

[Christian Hewitt]

Add initial support limited to HDMI i2s and SPDIF (LPCM).

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 .../boot/dts/amlogic/meson-g12a-u200.dts      | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index 4b5d11e56364..2878e3ad7de2 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -8,6 +8,7 @@
 #include "meson-g12a.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
 
 / {
 	compatible = "amlogic,u200", "amlogic,g12a";
@@ -18,6 +19,13 @@ aliases {
 		ethernet0 = &ethmac;
 	};
 
+	spdif_dit: audio-codec-1 {
+		#sound-dai-cells = <0>;
+		compatible = "linux,spdif-dit";
+		status = "okay";
+		sound-name-prefix = "DIT";
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
@@ -147,6 +155,89 @@ vddcpu: regulator-vddcpu {
 		regulator-boot-on;
 		regulator-always-on;
 	};
+
+	sound {
+		compatible = "amlogic,axg-sound-card";
+		model = "U200";
+		audio-aux-devs = <&tdmout_b>;
+		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
+				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
+				"TDM_B Playback", "TDMOUT_B OUT",
+				"SPDIFOUT IN 0", "FRDDR_A OUT 3",
+				"SPDIFOUT IN 1", "FRDDR_B OUT 3",
+				"SPDIFOUT IN 2", "FRDDR_C OUT 3";
+
+		assigned-clocks = <&clkc CLKID_MPLL2>,
+				  <&clkc CLKID_MPLL0>,
+				  <&clkc CLKID_MPLL1>;
+		assigned-clock-parents = <0>, <0>, <0>;
+		assigned-clock-rates = <294912000>,
+				       <270950400>,
+				       <393216000>;
+
+		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_b>;
+			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_B>;
+			};
+		};
+
+		/* spdif hdmi or toslink interface */
+		dai-link-4 {
+			sound-dai = <&spdifout>;
+
+			codec-0 {
+				sound-dai = <&spdif_dit>;
+			};
+
+			codec-1 {
+				sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_A>;
+			};
+		};
+
+		/* spdif hdmi interface */
+		dai-link-5 {
+			sound-dai = <&spdifout_b>;
+
+			codec {
+				sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_B>;
+			};
+		};
+
+		/* hdmi glue */
+		dai-link-6 {
+			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
+
+			codec {
+				sound-dai = <&hdmi_tx>;
+			};
+		};
+	};
+};
+
+&arb {
+	status = "okay";
 };
 
 &cec_AO {
@@ -163,6 +254,10 @@ &cecb_AO {
 	hdmi-phandle = <&hdmi_tx>;
 };
 
+&clkc_audio {
+	status = "okay";
+};
+
 &cpu0 {
 	cpu-supply = <&vddcpu>;
 	operating-points-v2 = <&cpu_opp_table>;
@@ -203,6 +298,18 @@ &ethmac {
 	phy-mode = "rmii";
 };
 
+&frddr_a {
+	status = "okay";
+};
+
+&frddr_b {
+	status = "okay";
+};
+
+&frddr_c {
+	status = "okay";
+};
+
 &hdmi_tx {
 	status = "okay";
 	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
@@ -288,6 +395,28 @@ &sd_emmc_c {
 	vqmmc-supply = <&flash_1v8>;
 };
 
+&spdifout {
+	pinctrl-0 = <&spdif_out_h_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&spdifout_b {
+	status = "okay";
+};
+
+&tdmif_b {
+	status = "okay";
+};
+
+&tdmout_b {
+	status = "okay";
+};
+
+&tohdmitx {
+	status = "okay";
+};
+
 &uart_AO {
 	status = "okay";
 	pinctrl-0 = <&uart_ao_a_pins>;
-- 
2.34.1

Re: [PATCH 0/3] arm64: dts: amlogic: add more basic audio support

[Jerome Brunet]

On Tue 15 Aug 2023 at 09:27, Christian Hewitt <christianshewitt@gmail.com> wrote:

> This mini-series adds basic audio support to the P200/P201 (GXBB) and U200 (G12A)
> reference boards. Few people likely have the original reference boards which have
> extra audio capabilities, but the device-trees are widely [ab]used by users with
> Android set-top boxes whose hardware is copy/pasted from the reference designs to
> get working installs. Adding basic audio support does no harm to the real boards
> and helps the secondary cause.

Still, this is something you have not tested on the u200 reference
design. I believe this was already discussed in the past.

The u200 is far more complex when it comes to audio and certainly would
not work on this no-name android device. These device are heavily
"inspired" by the reference, but trimmed down in many aspect including
audio capabilities - NOT copied.

People abusing the u200 or p200 DT does make the patchset valid

>
> Christian Hewitt (3):
>   arm64: dts: meson: add audio playback to p200
>   arm64: dts: meson: add audio playback to p201
>   arm64: dts: meson: add audio playback to u200
>
>  .../boot/dts/amlogic/meson-g12a-u200.dts      | 129 ++++++++++++++++++
>  .../boot/dts/amlogic/meson-gxbb-p200.dts      |  60 ++++++++
>  .../boot/dts/amlogic/meson-gxbb-p201.dts      |  39 ++++++
>  3 files changed, 228 insertions(+)

Re: [PATCH 0/3] arm64: dts: amlogic: add more basic audio support

[Neil Armstrong]

Hi,

On 15/08/2023 11:37, Jerome Brunet wrote:
> 
> On Tue 15 Aug 2023 at 09:27, Christian Hewitt <christianshewitt@gmail.com> wrote:
> 
>> This mini-series adds basic audio support to the P200/P201 (GXBB) and U200 (G12A)
>> reference boards. Few people likely have the original reference boards which have
>> extra audio capabilities, but the device-trees are widely [ab]used by users with
>> Android set-top boxes whose hardware is copy/pasted from the reference designs to
>> get working installs. Adding basic audio support does no harm to the real boards
>> and helps the secondary cause.
> 
> Still, this is something you have not tested on the u200 reference
> design. I believe this was already discussed in the past.
> 
> The u200 is far more complex when it comes to audio and certainly would
> not work on this no-name android device. These device are heavily
> "inspired" by the reference, but trimmed down in many aspect including
> audio capabilities - NOT copied.

I understand you point, but those changes only adds "internal" audio & basic spdif
capabilities so it won't affect the on-board audio electronics in any way.

> 
> People abusing the u200 or p200 DT does make the patchset valid

This is a reality, but still I think this patchset is valid and I'll
pick those since they are used for years out-of-tree and probably works
very fine in the reference design boards.

Neil

> 
>>
>> Christian Hewitt (3):
>>    arm64: dts: meson: add audio playback to p200
>>    arm64: dts: meson: add audio playback to p201
>>    arm64: dts: meson: add audio playback to u200
>>
>>   .../boot/dts/amlogic/meson-g12a-u200.dts      | 129 ++++++++++++++++++
>>   .../boot/dts/amlogic/meson-gxbb-p200.dts      |  60 ++++++++
>>   .../boot/dts/amlogic/meson-gxbb-p201.dts      |  39 ++++++
>>   3 files changed, 228 insertions(+)
> 

Re: [PATCH 0/3] arm64: dts: amlogic: add more basic audio support

[Neil Armstrong]

Hi,

On Tue, 15 Aug 2023 09:27:48 +0000, Christian Hewitt wrote:
> This mini-series adds basic audio support to the P200/P201 (GXBB) and U200 (G12A)
> reference boards. Few people likely have the original reference boards which have
> extra audio capabilities, but the device-trees are widely [ab]used by users with
> Android set-top boxes whose hardware is copy/pasted from the reference designs to
> get working installs. Adding basic audio support does no harm to the real boards
> and helps the secondary cause.
> 
> [...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.7/arm64-dt)

[1/3] arm64: dts: meson: add audio playback to p200
      https://git.kernel.org/amlogic/c/61373cc074128c40d53857803371c4a9384d4200
[2/3] arm64: dts: meson: add audio playback to p201
      https://git.kernel.org/amlogic/c/2b2827a19024abcf879c18053ae3f2fc23891ad4
[3/3] arm64: dts: meson: add audio playback to u200
      https://git.kernel.org/amlogic/c/cfae4eadb7cd44cb5f17285e18477bed4ae5f03c

These changes has been applied on the intermediate git tree [1].

The v6.7/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

-- 
Neil