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 6/6] arm64: dts: librem5-devkit: Move headphone detection to sound card
Date: Sun, 21 Feb 2021 12:07:11 +0100 [thread overview]
Message-ID: <4c16b2bc0f0d1e3cd2beaf0edb8dd017b8ee62d7.1613905397.git.agx@sigxcpu.org> (raw)
In-Reply-To: <cover.1613905396.git.agx@sigxcpu.org>
This allows for automatic output source switching in userspace. Enable
the pullup on the GPIO to actually make it trigger and mark it as
active-high since detection is reversed otherwise.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
---
.../dts/freescale/imx8mq-librem5-devkit.dts | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
index f818af592046..e3bfef98090a 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
@@ -50,13 +50,6 @@ btn2 {
linux,code = <KEY_VOLUMEDOWN>;
};
- hp-det {
- label = "HP_DET";
- gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
- wakeup-source;
- linux,code = <KEY_HP>;
- };
-
wwan-wake {
label = "WWAN_WAKE";
gpios = <&gpio3 8 GPIO_ACTIVE_LOW>;
@@ -173,22 +166,25 @@ mic_mux: mic-mux {
sound {
compatible = "simple-audio-card";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hpdet>;
simple-audio-card,aux-devs = <&speaker_amp>, <&mic_mux>;
simple-audio-card,name = "Librem 5 Devkit";
simple-audio-card,format = "i2s";
simple-audio-card,widgets =
"Microphone", "Builtin Microphone",
"Microphone", "Headset Microphone",
- "Headphone", "Headphone Jack",
+ "Headphone", "Headphones",
"Speaker", "Builtin Speaker";
simple-audio-card,routing =
"MIC_IN", "Mic Mux OUT",
"Mic Mux IN1", "Headset Microphone",
"Mic Mux IN2", "Builtin Microphone",
"Mic Mux OUT", "Mic Bias",
- "Headphone Jack", "HP_OUT",
+ "Headphones", "HP_OUT",
"Builtin Speaker", "Speaker Amp OUTR",
"Speaker Amp INR", "LINE_OUT";
+ simple-audio-card,hp-det-gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>;
simple-audio-card,cpu {
sound-dai = <&sai2>;
@@ -630,7 +626,6 @@ pinctrl_gpio_keys: gpiokeygrp {
fsl,pins = <
MX8MQ_IOMUXC_SAI2_RXFS_GPIO4_IO21 0x16
MX8MQ_IOMUXC_SAI2_RXC_GPIO4_IO22 0x16
- MX8MQ_IOMUXC_SAI5_RXC_GPIO3_IO20 0x180 /* HP_DET */
MX8MQ_IOMUXC_NAND_DATA02_GPIO3_IO8 0x80 /* nWoWWAN */
>;
};
@@ -641,6 +636,12 @@ MX8MQ_IOMUXC_SPDIF_RX_GPIO5_IO4 0xc6 /* nHAPTIC */
>;
};
+ pinctrl_hpdet: hpdetgrp {
+ fsl,pins = <
+ MX8MQ_IOMUXC_SAI5_RXC_GPIO3_IO20 0xC0 /* HP_DET */
+ >;
+ };
+
pinctrl_i2c1: i2c1grp {
fsl,pins = <
MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL 0x4000001f
--
2.30.0
next prev parent reply other threads:[~2021-02-21 11:09 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 ` [PATCH v1 2/6] arm64: dts: librem5-devkit: Add speaker amplifier Guido Günther
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 ` Guido Günther [this message]
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=4c16b2bc0f0d1e3cd2beaf0edb8dd017b8ee62d7.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).