* [PATCH v2] arm64: dts: allwinner: a64: olinuxino: Enable audio
@ 2021-11-28 15:19 Philip Rinn
2021-11-28 16:14 ` Jernej Škrabec
0 siblings, 1 reply; 3+ messages in thread
From: Philip Rinn @ 2021-11-28 15:19 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, linux-arm-kernel,
linux-sunxi
[-- Attachment #1.1.1: Type: text/plain, Size: 2699 bytes --]
Enable the audio hardware on the Olimex A64-OLinuXino board family.
Tested on the A64-OLinuXino-2Ge8G-IND variant.
Signed-off-by: Philip Rinn <rinni@inventati.org>
---
.../dts/allwinner/sun50i-a64-olinuxino.dts | 51 +++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
index ec7e2c0e82c1..e2f518c5854a 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
@@ -32,6 +32,22 @@ hdmi_con_in: endpoint {
};
};
+ hdmi-sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,name = "allwinner,hdmi";
+ simple-audio-card,mclk-fs = <256>;
+ status = "okay";
+
+ simple-audio-card,codec {
+ sound-dai = <&hdmi>;
+ };
+
+ simple-audio-card,cpu {
+ sound-dai = <&i2s2>;
+ };
+ };
+
leds {
compatible = "gpio-leds";
@@ -58,6 +74,15 @@ wifi_pwrseq: wifi_pwrseq {
};
};
+&codec {
+ status = "okay";
+};
+
+&codec_analog {
+ cpvdd-supply = <®_eldo1>;
+ status = "okay";
+};
+
&cpu0 {
cpu-supply = <®_dcdc2>;
};
@@ -74,6 +99,10 @@ &cpu3 {
cpu-supply = <®_dcdc2>;
};
+&dai {
+ status = "okay";
+};
+
&de {
status = "okay";
};
@@ -97,6 +126,7 @@ &emac {
};
&hdmi {
+ #sound-dai-cells = <0>;
hvcc-supply = <®_dldo1>;
status = "okay";
};
@@ -107,6 +137,10 @@ hdmi_out_con: endpoint {
};
};
+&i2s2 {
+ status = "okay";
+};
+
&mdio {
ext_rgmii_phy: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22";
@@ -328,6 +362,23 @@ &simplefb_hdmi {
vcc-hdmi-supply = <®_dldo1>;
};
+&sound {
+ simple-audio-card,aux-devs = <&codec_analog>;
+ simple-audio-card,widgets = "Microphone", "Microphone Jack Left",
+ "Microphone", "Microphone Jack Right",
+ "Headphone", "Headphone Jack";
+ simple-audio-card,routing = "Left DAC", "DACL",
+ "Right DAC", "DACR",
+ "Headphone Jack", "HP",
+ "ADCL", "Left ADC",
+ "ADCR", "Right ADC",
+ "Microphone Jack Left", "MBIAS",
+ "MIC1", "Microphone Jack Left",
+ "Microphone Jack Left", "HBIAS",
+ "MIC2", "Microphone Jack Right";
+ status = "okay";
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pb_pins>;
--
2.33.0
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] arm64: dts: allwinner: a64: olinuxino: Enable audio
2021-11-28 15:19 [PATCH v2] arm64: dts: allwinner: a64: olinuxino: Enable audio Philip Rinn
@ 2021-11-28 16:14 ` Jernej Škrabec
2021-11-28 16:26 ` Philip Rinn
0 siblings, 1 reply; 3+ messages in thread
From: Jernej Škrabec @ 2021-11-28 16:14 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, linux-arm-kernel, linux-sunxi, Philip Rinn
Hi Philip!
Dne nedelja, 28. november 2021 ob 16:19:34 CET je Philip Rinn napisal(a):
> Enable the audio hardware on the Olimex A64-OLinuXino board family.
> Tested on the A64-OLinuXino-2Ge8G-IND variant.
>
> Signed-off-by: Philip Rinn <rinni@inventati.org>
>
> ---
You should put changelog here when you send new version of the patch.
>
> .../dts/allwinner/sun50i-a64-olinuxino.dts | 51 +++++++++++++++++++
>
> 1 file changed, 51 insertions(+)
>
>
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
> b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
>
> index ec7e2c0e82c1..e2f518c5854a 100644
>
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
>
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
>
> @@ -32,6 +32,22 @@ hdmi_con_in: endpoint {
>
> };
>
> };
>
>
>
> + hdmi-sound {
>
> + compatible = "simple-audio-card";
>
> + simple-audio-card,format = "i2s";
>
> + simple-audio-card,name = "allwinner,hdmi";
>
> + simple-audio-card,mclk-fs = <256>;
>
> + status = "okay";
>
> +
>
> + simple-audio-card,codec {
>
> + sound-dai = <&hdmi>;
>
> + };
Drop everything related to hdmi audio. There was quite a few e-mails regarding
how to best approach hdmi audio implementation on A64 and other SoCs with DW
HDMI core. Agreement is that we should introduce HDMI audio card driver
instead of simple audio card. I have this almost implemented, but I didn't find
time to polish it. Another thing is that there is nothing board specific about
HDMI audio, so nodes should reside in SoC DTSI file anyway.
Best regards,
Jernej
>
> +
>
> + simple-audio-card,cpu {
>
> + sound-dai = <&i2s2>;
>
> + };
>
> + };
>
> +
>
> leds {
>
> compatible = "gpio-leds";
>
>
>
> @@ -58,6 +74,15 @@ wifi_pwrseq: wifi_pwrseq {
>
> };
>
> };
>
>
>
> +&codec {
>
> + status = "okay";
>
> +};
>
> +
>
> +&codec_analog {
>
> + cpvdd-supply = <®_eldo1>;
>
> + status = "okay";
>
> +};
>
> +
>
> &cpu0 {
>
> cpu-supply = <®_dcdc2>;
>
> };
>
> @@ -74,6 +99,10 @@ &cpu3 {
>
> cpu-supply = <®_dcdc2>;
>
> };
>
>
>
> +&dai {
>
> + status = "okay";
>
> +};
>
> +
>
> &de {
>
> status = "okay";
>
> };
>
> @@ -97,6 +126,7 @@ &emac {
>
> };
>
>
>
> &hdmi {
>
> + #sound-dai-cells = <0>;
>
> hvcc-supply = <®_dldo1>;
>
> status = "okay";
>
> };
>
> @@ -107,6 +137,10 @@ hdmi_out_con: endpoint {
>
> };
>
> };
>
>
>
> +&i2s2 {
>
> + status = "okay";
>
> +};
>
> +
>
> &mdio {
>
> ext_rgmii_phy: ethernet-phy@1 {
>
> compatible = "ethernet-phy-ieee802.3-c22";
>
> @@ -328,6 +362,23 @@ &simplefb_hdmi {
>
> vcc-hdmi-supply = <®_dldo1>;
>
> };
>
>
>
> +&sound {
>
> + simple-audio-card,aux-devs = <&codec_analog>;
>
> + simple-audio-card,widgets = "Microphone", "Microphone Jack Left",
>
> + "Microphone", "Microphone Jack Right",
>
> + "Headphone", "Headphone Jack";
>
> + simple-audio-card,routing = "Left DAC", "DACL",
>
> + "Right DAC", "DACR",
>
> + "Headphone Jack", "HP",
>
> + "ADCL", "Left ADC",
>
> + "ADCR", "Right ADC",
>
> + "Microphone Jack Left", "MBIAS",
>
> + "MIC1", "Microphone Jack Left",
>
> + "Microphone Jack Left", "HBIAS",
>
> + "MIC2", "Microphone Jack Right";
>
> + status = "okay";
>
> +};
>
> +
>
> &uart0 {
>
> pinctrl-names = "default";
>
> pinctrl-0 = <&uart0_pb_pins>;
>
> --
>
> 2.33.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] arm64: dts: allwinner: a64: olinuxino: Enable audio
2021-11-28 16:14 ` Jernej Škrabec
@ 2021-11-28 16:26 ` Philip Rinn
0 siblings, 0 replies; 3+ messages in thread
From: Philip Rinn @ 2021-11-28 16:26 UTC (permalink / raw)
To: Jernej Škrabec, Maxime Ripard, Chen-Yu Tsai,
linux-arm-kernel, linux-sunxi
[-- Attachment #1.1.1: Type: text/plain, Size: 614 bytes --]
Hi Jernej,
On 28.11.21 at 17:14, Jernej Škrabec wrote:
> Drop everything related to hdmi audio. There was quite a few e-mails regarding
> how to best approach hdmi audio implementation on A64 and other SoCs with DW
> HDMI core. Agreement is that we should introduce HDMI audio card driver
> instead of simple audio card. I have this almost implemented, but I didn't find
> time to polish it. Another thing is that there is nothing board specific about
> HDMI audio, so nodes should reside in SoC DTSI file anyway.
OK, I did this in v3 of the patch, I'll send it in a minute.
Best regards,
Philip
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-28 16:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-28 15:19 [PATCH v2] arm64: dts: allwinner: a64: olinuxino: Enable audio Philip Rinn
2021-11-28 16:14 ` Jernej Škrabec
2021-11-28 16:26 ` Philip Rinn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).