From: Vasily Khoruzhick <anarsoul@gmail.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Vasily Khoruzhick <anarsoul@gmail.com>,
Jerome Brunet <jbrunet@baylibre.com>,
alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 6/7] arm64: dts: allwinner: a64: enable sound on Pine64 and SoPine
Date: Tue, 20 Nov 2018 21:17:51 -0800 [thread overview]
Message-ID: <20181121051752.18387-7-anarsoul@gmail.com> (raw)
In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com>
This commit enables I2S, digital and analog parts of audiocodec on
Pine64 and SoPine boards.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
.../boot/dts/allwinner/sun50i-a64-pine64.dts | 35 +++++++++++++++++++
.../allwinner/sun50i-a64-sopine-baseboard.dts | 35 +++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index c077b6c1f458..30d0743d0d79 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -73,6 +73,24 @@
};
};
};
+
+ headphone_amp: headphone_amp {
+ compatible = "simple-audio-amplifier";
+ VCC-supply = <®_eldo1>;
+ sound-name-prefix = "HP";
+ };
+};
+
+&codec {
+ status = "okay";
+};
+
+&codec_analog {
+ status = "okay";
+};
+
+&dai {
+ status = "okay";
};
&de {
@@ -259,6 +277,23 @@
vcc-hdmi-supply = <®_dldo1>;
};
+&sound {
+ simple-audio-card,aux-devs = <&codec_analog>, <&headphone_amp>;
+ simple-audio-card,widgets = "Microphone", "Microphone Jack",
+ "Headphone", "Headphone Jack";
+ simple-audio-card,routing =
+ "Left DAC", "AIF1 Slot 0 Left",
+ "Right DAC", "AIF1 Slot 0 Right",
+ "HP INL", "HP",
+ "HP INR", "HP",
+ "Headphone Jack", "HP OUTL",
+ "Headphone Jack", "HP OUTR",
+ "AIF1 Slot 0 Left ADC", "Left ADC",
+ "AIF1 Slot 0 Right ADC", "Right ADC",
+ "MIC2", "Microphone Jack";
+ status = "okay";
+};
+
/* On Euler connector */
&spdif {
status = "disabled";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 53fcc9098df3..81d85ad127a2 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -72,6 +72,12 @@
};
};
+ headphone_amp: headphone_amp {
+ compatible = "simple-audio-amplifier";
+ VCC-supply = <®_eldo1>;
+ sound-name-prefix = "HP";
+ };
+
reg_vcc1v8: vcc1v8 {
compatible = "regulator-fixed";
regulator-name = "vcc1v8";
@@ -80,6 +86,18 @@
};
};
+&codec {
+ status = "okay";
+};
+
+&codec_analog {
+ status = "okay";
+};
+
+&dai {
+ status = "okay";
+};
+
&de {
status = "okay";
};
@@ -164,6 +182,23 @@
vcc-hdmi-supply = <®_dldo1>;
};
+&sound {
+ simple-audio-card,aux-devs = <&codec_analog>, <&headphone_amp>;
+ simple-audio-card,widgets = "Microphone", "Microphone Jack",
+ "Headphone", "Headphone Jack";
+ simple-audio-card,routing =
+ "Left DAC", "AIF1 Slot 0 Left",
+ "Right DAC", "AIF1 Slot 0 Right",
+ "HP INL", "HP",
+ "HP INR", "HP",
+ "Headphone Jack", "HP OUTL",
+ "Headphone Jack", "HP OUTR",
+ "AIF1 Slot 0 Left ADC", "Left ADC",
+ "AIF1 Slot 0 Right ADC", "Right ADC",
+ "MIC2", "Microphone Jack";
+ status = "okay";
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pb_pins>;
--
2.19.1
next prev parent reply other threads:[~2018-11-21 5:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 5:17 [PATCH v8 0/7] Add support for audiocodec in Allwinner A64 Vasily Khoruzhick
2018-11-21 5:17 ` [PATCH v8 1/7] ASoC: dt-bindings: add regulator property to simple amplifier Vasily Khoruzhick
2018-11-26 14:53 ` Mark Brown
2018-11-21 5:17 ` [PATCH v8 2/7] ASoC: simple-amplifier: add VCC regulator widget Vasily Khoruzhick
2018-11-21 5:17 ` [PATCH v8 3/7] ASoC: dt-bindings: make enable-gpio optional for simple amplifier Vasily Khoruzhick
2018-12-06 23:43 ` Rob Herring
2018-11-21 5:17 ` [PATCH v8 4/7] ASoC: simple-amplifier: make enable-gpio optional Vasily Khoruzhick
2018-11-21 5:17 ` [PATCH v8 5/7] arm64: dts: allwinner: a64: add nodes necessary for analog sound support Vasily Khoruzhick
2018-11-21 5:17 ` Vasily Khoruzhick [this message]
2018-11-21 5:17 ` [PATCH v8 7/7] arm64: dts: allwinner: a64: enable sound on Pinebook Vasily Khoruzhick
2018-11-21 5:54 ` 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=20181121051752.18387-7-anarsoul@gmail.com \
--to=anarsoul@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet@baylibre.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=tiwai@suse.com \
--cc=wens@csie.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;
as well as URLs for NNTP newsgroup(s).