* [PATCH 0/2] arm64: dts: meson: p241: add internal sound support
@ 2021-11-30 10:01 Jerome Brunet
2021-11-30 10:01 ` [PATCH 1/2] arm64: dts: meson: p241: add vcc_5v regulator Jerome Brunet
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jerome Brunet @ 2021-11-30 10:01 UTC (permalink / raw)
To: Kevin Hilman, Neil Armstrong
Cc: Jerome Brunet, linux-amlogic, devicetree, linux-kernel
This patchset adds support for the internal sound card of the s805x p241
reference design. Audio is available on HDMI and 3.5mm jack connector.
Jerome Brunet (2):
arm64: dts: meson: p241: add vcc_5v regulator
arm64: dts: meson: p241: add sound support
.../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 83 +++++++++++++++++++
1 file changed, 83 insertions(+)
--
2.34.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] arm64: dts: meson: p241: add vcc_5v regulator
2021-11-30 10:01 [PATCH 0/2] arm64: dts: meson: p241: add internal sound support Jerome Brunet
@ 2021-11-30 10:01 ` Jerome Brunet
2021-11-30 10:40 ` Neil Armstrong
2021-11-30 10:01 ` [PATCH 2/2] arm64: dts: meson: p241: add sound support Jerome Brunet
2021-11-30 10:43 ` [PATCH 0/2] arm64: dts: meson: p241: add internal " Neil Armstrong
2 siblings, 1 reply; 6+ messages in thread
From: Jerome Brunet @ 2021-11-30 10:01 UTC (permalink / raw)
To: Kevin Hilman, Neil Armstrong
Cc: Jerome Brunet, linux-amlogic, devicetree, linux-kernel
Add the VCC_5V regulator, which feeds the HDMI, USB and audio amplifier.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
.../arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
index eb7f5a3fefd4..9d0684a8264b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
@@ -84,6 +84,14 @@ vcc_3v3: regulator-vcc_3v3 {
regulator-max-microvolt = <3300000>;
};
+ vcc_5v: regulator-vcc-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "VCC_5V";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
+
+
emmc_pwrseq: emmc-pwrseq {
compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
@@ -136,6 +144,7 @@ &hdmi_tx {
status = "okay";
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
pinctrl-names = "default";
+ hdmi-supply = <&vcc_5v>;
};
&hdmi_tx_tmds_port {
@@ -220,3 +229,7 @@ &usb {
status = "okay";
dr_mode = "host";
};
+
+&usb2_phy0 {
+ phy-supply = <&vcc_5v>;
+};
--
2.34.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm64: dts: meson: p241: add sound support
2021-11-30 10:01 [PATCH 0/2] arm64: dts: meson: p241: add internal sound support Jerome Brunet
2021-11-30 10:01 ` [PATCH 1/2] arm64: dts: meson: p241: add vcc_5v regulator Jerome Brunet
@ 2021-11-30 10:01 ` Jerome Brunet
2021-11-30 10:41 ` Neil Armstrong
2021-11-30 10:43 ` [PATCH 0/2] arm64: dts: meson: p241: add internal " Neil Armstrong
2 siblings, 1 reply; 6+ messages in thread
From: Jerome Brunet @ 2021-11-30 10:01 UTC (permalink / raw)
To: Kevin Hilman, Neil Armstrong
Cc: Jerome Brunet, linux-amlogic, devicetree, linux-kernel
Add the p241 sound card support. This board can play audio through HDMI
and the internal DAC.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
.../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 70 +++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
index 9d0684a8264b..ff906becd2ab 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
@@ -8,6 +8,7 @@
/dts-v1/;
#include <dt-bindings/input/input.h>
+#include <dt-bindings/sound/meson-aiu.h>
#include "meson-gxl-s805x.dtsi"
@@ -21,6 +22,13 @@ aliases {
ethernet0 = ðmac;
};
+ au2: analog-amplifier {
+ compatible = "simple-audio-amplifier";
+ sound-name-prefix = "AU2";
+ VCC-supply = <&vcc_5v>;
+ enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
+ };
+
chosen {
stdout-path = "serial0:115200n8";
};
@@ -110,6 +118,68 @@ sdio_pwrseq: sdio-pwrseq {
clocks = <&wifi32k>;
clock-names = "ext_clock";
};
+
+ sound {
+ compatible = "amlogic,gx-sound-card";
+ model = "GXL-P241";
+ audio-aux-devs = <&au2>;
+ audio-widgets = "Line", "Lineout";
+ audio-routing = "AU2 INL", "ACODEC LOLN",
+ "AU2 INR", "ACODEC LORN",
+ "Lineout", "AU2 OUTL",
+ "Lineout", "AU2 OUTR";
+ 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>;
+ };
+
+ codec-1 {
+ sound-dai = <&aiu AIU_ACODEC CTRL_I2S>;
+ };
+ };
+
+ dai-link-2 {
+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
+
+ codec-0 {
+ sound-dai = <&hdmi_tx>;
+ };
+ };
+
+ dai-link-3 {
+ sound-dai = <&aiu AIU_ACODEC CTRL_OUT>;
+
+ codec-0 {
+ sound-dai = <&acodec>;
+ };
+ };
+ };
+};
+
+&acodec {
+ AVDD-supply = <&vddio_ao18>;
+ status = "okay";
+};
+
+&aiu {
+ status = "okay";
};
&cec_AO {
--
2.34.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] arm64: dts: meson: p241: add vcc_5v regulator
2021-11-30 10:01 ` [PATCH 1/2] arm64: dts: meson: p241: add vcc_5v regulator Jerome Brunet
@ 2021-11-30 10:40 ` Neil Armstrong
0 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2021-11-30 10:40 UTC (permalink / raw)
To: Jerome Brunet, Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel
On 30/11/2021 11:01, Jerome Brunet wrote:
> Add the VCC_5V regulator, which feeds the HDMI, USB and audio amplifier.
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> .../arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
> index eb7f5a3fefd4..9d0684a8264b 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
> @@ -84,6 +84,14 @@ vcc_3v3: regulator-vcc_3v3 {
> regulator-max-microvolt = <3300000>;
> };
>
> + vcc_5v: regulator-vcc-5v {
> + compatible = "regulator-fixed";
> + regulator-name = "VCC_5V";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + };
> +
> +
> emmc_pwrseq: emmc-pwrseq {
> compatible = "mmc-pwrseq-emmc";
> reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
> @@ -136,6 +144,7 @@ &hdmi_tx {
> status = "okay";
> pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
> pinctrl-names = "default";
> + hdmi-supply = <&vcc_5v>;
> };
>
> &hdmi_tx_tmds_port {
> @@ -220,3 +229,7 @@ &usb {
> status = "okay";
> dr_mode = "host";
> };
> +
> +&usb2_phy0 {
> + phy-supply = <&vcc_5v>;
> +};
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] arm64: dts: meson: p241: add sound support
2021-11-30 10:01 ` [PATCH 2/2] arm64: dts: meson: p241: add sound support Jerome Brunet
@ 2021-11-30 10:41 ` Neil Armstrong
0 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2021-11-30 10:41 UTC (permalink / raw)
To: Jerome Brunet, Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel
On 30/11/2021 11:01, Jerome Brunet wrote:
> Add the p241 sound card support. This board can play audio through HDMI
> and the internal DAC.
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 70 +++++++++++++++++++
> 1 file changed, 70 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
> index 9d0684a8264b..ff906becd2ab 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
> @@ -8,6 +8,7 @@
> /dts-v1/;
>
> #include <dt-bindings/input/input.h>
> +#include <dt-bindings/sound/meson-aiu.h>
>
> #include "meson-gxl-s805x.dtsi"
>
> @@ -21,6 +22,13 @@ aliases {
> ethernet0 = ðmac;
> };
>
> + au2: analog-amplifier {
> + compatible = "simple-audio-amplifier";
> + sound-name-prefix = "AU2";
> + VCC-supply = <&vcc_5v>;
> + enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
> + };
> +
> chosen {
> stdout-path = "serial0:115200n8";
> };
> @@ -110,6 +118,68 @@ sdio_pwrseq: sdio-pwrseq {
> clocks = <&wifi32k>;
> clock-names = "ext_clock";
> };
> +
> + sound {
> + compatible = "amlogic,gx-sound-card";
> + model = "GXL-P241";
> + audio-aux-devs = <&au2>;
> + audio-widgets = "Line", "Lineout";
> + audio-routing = "AU2 INL", "ACODEC LOLN",
> + "AU2 INR", "ACODEC LORN",
> + "Lineout", "AU2 OUTL",
> + "Lineout", "AU2 OUTR";
> + 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>;
> + };
> +
> + codec-1 {
> + sound-dai = <&aiu AIU_ACODEC CTRL_I2S>;
> + };
> + };
> +
> + dai-link-2 {
> + sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
> +
> + codec-0 {
> + sound-dai = <&hdmi_tx>;
> + };
> + };
> +
> + dai-link-3 {
> + sound-dai = <&aiu AIU_ACODEC CTRL_OUT>;
> +
> + codec-0 {
> + sound-dai = <&acodec>;
> + };
> + };
> + };
> +};
> +
> +&acodec {
> + AVDD-supply = <&vddio_ao18>;
> + status = "okay";
> +};
> +
> +&aiu {
> + status = "okay";
> };
>
> &cec_AO {
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] arm64: dts: meson: p241: add internal sound support
2021-11-30 10:01 [PATCH 0/2] arm64: dts: meson: p241: add internal sound support Jerome Brunet
2021-11-30 10:01 ` [PATCH 1/2] arm64: dts: meson: p241: add vcc_5v regulator Jerome Brunet
2021-11-30 10:01 ` [PATCH 2/2] arm64: dts: meson: p241: add sound support Jerome Brunet
@ 2021-11-30 10:43 ` Neil Armstrong
2 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2021-11-30 10:43 UTC (permalink / raw)
To: Jerome Brunet, Kevin Hilman
Cc: Neil Armstrong, devicetree, linux-amlogic, linux-kernel
Hi,
On Tue, 30 Nov 2021 11:01:57 +0100, Jerome Brunet wrote:
> This patchset adds support for the internal sound card of the s805x p241
> reference design. Audio is available on HDMI and 3.5mm jack connector.
>
> Jerome Brunet (2):
> arm64: dts: meson: p241: add vcc_5v regulator
> arm64: dts: meson: p241: add sound support
>
> [...]
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v5.17/dt64)
[1/2] arm64: dts: meson: p241: add vcc_5v regulator
https://git.kernel.org/amlogic/c/bca54f711c0a2506efcce03a02f96f39b311f188
[2/2] arm64: dts: meson: p241: add sound support
https://git.kernel.org/amlogic/c/c5468e3c930d4d2937d3a842a85df0f74e95e152
--
Neil
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-30 10:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-30 10:01 [PATCH 0/2] arm64: dts: meson: p241: add internal sound support Jerome Brunet
2021-11-30 10:01 ` [PATCH 1/2] arm64: dts: meson: p241: add vcc_5v regulator Jerome Brunet
2021-11-30 10:40 ` Neil Armstrong
2021-11-30 10:01 ` [PATCH 2/2] arm64: dts: meson: p241: add sound support Jerome Brunet
2021-11-30 10:41 ` Neil Armstrong
2021-11-30 10:43 ` [PATCH 0/2] arm64: dts: meson: p241: add internal " Neil Armstrong
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).