From: wens@csie.org (Chen-Yu Tsai)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v9 8/8] arm64: dts: allwinner: a64: enable sound on Pinebook
Date: Thu, 22 Nov 2018 18:23:25 +0800 [thread overview]
Message-ID: <20181122102325.29495-9-wens@csie.org> (raw)
In-Reply-To: <20181122102325.29495-1-wens@csie.org>
From: Vasily Khoruzhick <anarsoul@gmail.com>
The Pinebook has a headphone jack tied to the HP headphone output of
the SoC, and internal speakers connected to the LINEOUT of the SoC,
through a standalone amplifier.
This commit enables I2S, digital and analog parts of audio codec on
Pinebook, along with a device node for the external amplifier.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
[wens at csie.org: dropped headphone_amp; added headphone amp regulator supply;
fixed speaker_amp node name and sound-name-prefix name]
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
.../dts/allwinner/sun50i-a64-pinebook.dts | 49 +++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index ec537c529726..b6d0b926a2ff 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -74,6 +74,32 @@
compatible = "mmc-pwrseq-simple";
reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
};
+
+ speaker_amp: audio-amplifier {
+ compatible = "simple-audio-amplifier";
+ /*
+ * TODO This is actually a fixed regulator controlled by
+ * the GPIO line on the PMIC. This should be corrected
+ * once GPIO support is added for this PMIC.
+ */
+ VCC-supply = <®_ldo_io0>;
+ enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
+ sound-name-prefix = "Speaker Amp";
+ };
+
+};
+
+&codec {
+ hpvcc-supply = <®_eldo1>;
+ status = "okay";
+};
+
+&codec_analog {
+ status = "okay";
+};
+
+&dai {
+ status = "okay";
};
&ehci0 {
@@ -277,6 +303,29 @@
vcc-hdmi-supply = <®_dldo1>;
};
+&sound {
+ status = "okay";
+ simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
+ simple-audio-card,widgets = "Microphone", "Internal Microphone Left",
+ "Microphone", "Internal Microphone Right",
+ "Headphone", "Headphone Jack",
+ "Speaker", "Internal Speaker";
+ simple-audio-card,routing =
+ "Left DAC", "AIF1 Slot 0 Left",
+ "Right DAC", "AIF1 Slot 0 Right",
+ "Speaker Amp INL", "LINEOUT",
+ "Speaker Amp INR", "LINEOUT",
+ "Internal Speaker", "Speaker Amp OUTL",
+ "Internal Speaker", "Speaker Amp OUTR",
+ "Headphone Jack", "HP",
+ "AIF1 Slot 0 Left ADC", "Left ADC",
+ "AIF1 Slot 0 Right ADC", "Right ADC",
+ "Internal Microphone Left", "MBIAS",
+ "MIC1", "Internal Microphone Left",
+ "Internal Microphone Right", "HBIAS",
+ "MIC2", "Internal Microphone Right";
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pb_pins>;
--
2.19.1
next prev parent reply other threads:[~2018-11-22 10:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-22 10:23 [PATCH v9 0/8] Add support for audiocodec in Allwinner A64 Chen-Yu Tsai
2018-11-22 10:23 ` [PATCH v9 1/8] ASoC: dt-bindings: sun50i-codec-analog: Add headphone amp regulator supply Chen-Yu Tsai
2018-11-22 15:32 ` Maxime Ripard
2018-11-22 15:41 ` Chen-Yu Tsai
2018-11-22 15:48 ` Maxime Ripard
2018-11-23 2:11 ` Chen-Yu Tsai
2018-11-23 13:31 ` Mark Brown
2018-11-23 14:14 ` Applied "ASoC: dt-bindings: sun50i-codec-analog: Add headphone amp regulator supply" to the asoc tree Mark Brown
2018-11-22 10:23 ` [PATCH v9 2/8] ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply Chen-Yu Tsai
2018-11-23 14:14 ` Applied "ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply" to the asoc tree Mark Brown
2018-11-22 10:23 ` [PATCH v9 3/8] ASoC: dt-bindings: add regulator property to simple amplifier Chen-Yu Tsai
2018-11-26 19:14 ` Rob Herring
2018-11-22 10:23 ` [PATCH v9 4/8] ASoC: simple-amplifier: add VCC regulator widget Chen-Yu Tsai
2018-11-22 10:23 ` [PATCH v9 5/8] clk: sunxi-ng: sun50i: a64: Use sigma-delta modulation for audio PLL Chen-Yu Tsai
2018-11-22 10:23 ` [PATCH v9 6/8] arm64: dts: allwinner: a64: add nodes necessary for analog sound support Chen-Yu Tsai
2018-11-22 10:23 ` [PATCH v9 7/8] arm64: dts: allwinner: a64: enable sound on Pine64 and SoPine Chen-Yu Tsai
2018-11-22 10:23 ` Chen-Yu Tsai [this message]
2018-11-23 4:15 ` [PATCH v9 8/8] arm64: dts: allwinner: a64: enable sound on Pinebook Vasily Khoruzhick
2018-11-23 4:26 ` [PATCH v9 0/8] Add support for audiocodec in Allwinner A64 Vasily Khoruzhick
2018-11-23 4:37 ` Chen-Yu Tsai
2018-11-23 16:03 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181122102325.29495-9-wens@csie.org \
--to=wens@csie.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox