From: "Guido Günther" <agx@sigxcpu.org>
To: "Rob Herring" <robh+dt@kernel.org>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Fabio Estevam" <festevam@gmail.com>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>,
"Guido Günther" <agx@sigxcpu.org>,
"Martin Kepplinger" <martink@posteo.de>,
"Angus Ainslie (Purism)" <angus@akkea.ca>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Bjorn Andersson" <bjorn.andersson@linaro.org>,
"Li Yang" <leoyang.li@nxp.com>,
"Geert Uytterhoeven" <geert+renesas@glider.be>,
"Michael Walle" <michael@walle.cc>,
"Max Krummenacher" <max.oss.09@gmail.com>,
"Nishanth Menon" <nm@ti.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v1 2/6] arm64: dts: librem5-devkit: Add speaker amplifier
Date: Sun, 21 Feb 2021 12:07:07 +0100 [thread overview]
Message-ID: <53e81ef700ebc77acea774e691888ae8a0a8d4cf.1613905397.git.agx@sigxcpu.org> (raw)
In-Reply-To: <cover.1613905396.git.agx@sigxcpu.org>
Wire up the amplifier that drives the builtin speaker.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
---
.../dts/freescale/imx8mq-librem5-devkit.dts | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
index 0c0b12c90363..d01bed5eb9e0 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
@@ -165,19 +165,21 @@ wwan_codec: sound-wwan-codec {
sound {
compatible = "simple-audio-card";
+ simple-audio-card,aux-devs = <&speaker_amp>;
simple-audio-card,name = "Librem 5 Devkit";
simple-audio-card,format = "i2s";
simple-audio-card,widgets =
"Microphone", "Microphone Jack",
"Headphone", "Headphone Jack",
- "Speaker", "Speaker Ext",
+ "Speaker", "Builtin Speaker",
"Line", "Line In Jack";
simple-audio-card,routing =
"MIC_IN", "Microphone Jack",
"Microphone Jack", "Mic Bias",
"LINE_IN", "Line In Jack",
"Headphone Jack", "HP_OUT",
- "Speaker Ext", "LINE_OUT";
+ "Builtin Speaker", "Speaker Amp OUTR",
+ "Speaker Amp INR", "LINE_OUT";
simple-audio-card,cpu {
sound-dai = <&sai2>;
@@ -207,6 +209,15 @@ telephony_link_master: simple-audio-card,codec {
};
};
+ speaker_amp: speaker-amp {
+ compatible = "simple-audio-amplifier";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spkamp>;
+ VCC-supply = <®_3v3_p>;
+ sound-name-prefix = "Speaker Amp";
+ enable-gpios = <&gpio5 3 GPIO_ACTIVE_HIGH>;
+ };
+
vibrator {
compatible = "gpio-vibrator";
pinctrl-names = "default";
@@ -641,6 +652,12 @@ MX8MQ_IOMUXC_SAI5_RXFS_GPIO3_IO19 0x8 /* IMU_INT */
>;
};
+ pinctrl_spkamp: spkamp {
+ fsl,pins = <
+ MX8MQ_IOMUXC_SPDIF_TX_GPIO5_IO3 0x81 /* MUTE */
+ >;
+ };
+
pinctrl_pmic: pmicgrp {
fsl,pins = <
MX8MQ_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x80 /* PMIC intr */
--
2.30.0
next prev parent reply other threads:[~2021-02-21 11:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-21 11:07 [PATCH v1 0/6] arm64: dts: librem5-devkit: Improve audio support Guido Günther
2021-02-21 11:07 ` [PATCH v1 1/6] arm64: dts: librem5-devkit: Use a less generic codec name Guido Günther
2021-02-21 11:07 ` Guido Günther [this message]
2021-02-21 11:07 ` [PATCH v1 3/6] arm64: dts: librem5-devkit: "Drop Line In Jack" Guido Günther
2021-02-21 11:07 ` [PATCH v1 4/6] arm64: defconfig: Enable asoc simple mux Guido Günther
2021-02-21 11:07 ` [PATCH v1 5/6] arm64: dts: librem5-devkit: Add mux for built-in vs headset mic Guido Günther
2021-02-21 11:07 ` [PATCH v1 6/6] arm64: dts: librem5-devkit: Move headphone detection to sound card Guido Günther
2021-03-07 13:45 ` [PATCH v1 0/6] arm64: dts: librem5-devkit: Improve audio support Shawn Guo
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=53e81ef700ebc77acea774e691888ae8a0a8d4cf.1613905397.git.agx@sigxcpu.org \
--to=agx@sigxcpu.org \
--cc=angus@akkea.ca \
--cc=bjorn.andersson@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=geert+renesas@glider.be \
--cc=kernel@pengutronix.de \
--cc=krzk@kernel.org \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martink@posteo.de \
--cc=max.oss.09@gmail.com \
--cc=michael@walle.cc \
--cc=nm@ti.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=will@kernel.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).