From: Jonathan Tinkham <sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org,
gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
Jonathan Tinkham
<sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 2/4] sound/soc: tegra_max98090: rename headphone jack DAPM
Date: Wed, 3 Feb 2016 22:31:00 -0700 [thread overview]
Message-ID: <1454563862-1971-3-git-send-email-sctincman@gmail.com> (raw)
In-Reply-To: <1454563862-1971-1-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
The correct DAPM name for a headphone jack is "Headphone Jack"
This is also what userspace expects, and this fixes headphone detection.
Signed-off-by: Jonathan Tinkham <sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
sound/soc/tegra/tegra_max98090.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
index b373d06..a015d1b 100644
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -101,7 +101,7 @@ static struct snd_soc_jack tegra_max98090_hp_jack;
static struct snd_soc_jack_pin tegra_max98090_hp_jack_pins[] = {
{
- .pin = "Headphones",
+ .pin = "Headphone Jack",
.mask = SND_JACK_HEADPHONE,
},
};
@@ -130,14 +130,14 @@ static struct snd_soc_jack_gpio tegra_max98090_mic_jack_gpio = {
};
static const struct snd_soc_dapm_widget tegra_max98090_dapm_widgets[] = {
- SND_SOC_DAPM_HP("Headphones", NULL),
+ SND_SOC_DAPM_HP("Headphone Jack", NULL),
SND_SOC_DAPM_SPK("Speakers", NULL),
SND_SOC_DAPM_MIC("Mic Jack", NULL),
SND_SOC_DAPM_MIC("Int Mic", NULL),
};
static const struct snd_kcontrol_new tegra_max98090_controls[] = {
- SOC_DAPM_PIN_SWITCH("Headphones"),
+ SOC_DAPM_PIN_SWITCH("Headphone Jack"),
SOC_DAPM_PIN_SWITCH("Speakers"),
SOC_DAPM_PIN_SWITCH("Mic Jack"),
SOC_DAPM_PIN_SWITCH("Int Mic"),
@@ -148,7 +148,7 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
struct tegra_max98090 *machine = snd_soc_card_get_drvdata(rtd->card);
if (gpio_is_valid(machine->gpio_hp_det)) {
- snd_soc_card_jack_new(rtd->card, "Headphones",
+ snd_soc_card_jack_new(rtd->card, "Headphone Jack",
SND_JACK_HEADPHONE,
&tegra_max98090_hp_jack,
tegra_max98090_hp_jack_pins,
--
2.7.0
next prev parent reply other threads:[~2016-02-04 5:31 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 5:30 [PATCH 0/4] Fix headphone detection on Acer Chromebook 13 Jonathan Tinkham
[not found] ` <1454563862-1971-1-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-04 5:30 ` [PATCH 1/4] soc/sound: tegra_max98090: do not invert headphone jack Jonathan Tinkham
[not found] ` <1454563862-1971-2-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-04 16:36 ` Stephen Warren
[not found] ` <56B37E19.6010002-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-04 19:05 ` Jonathan Tinkham
[not found] ` <56B3A10E.4010508-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-04 19:17 ` Dylan Reid
[not found] ` <CAEUnVG7bCgzC-f_Anaw6qayGsXi=_NrWZGRy7SSALkLVLPZnUQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-02-08 18:56 ` Stephen Warren
[not found] ` <56B8E4D8.8070604-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-13 2:12 ` Jonathan Tinkham
[not found] ` <56BE9125.3060104-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-16 21:43 ` Stephen Warren
2016-02-04 19:37 ` Mark Brown
2016-02-08 18:59 ` Stephen Warren
[not found] ` <56B8E5AD.8040707-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-13 2:10 ` Jonathan Tinkham
[not found] ` <56BE9094.1040500-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-16 21:41 ` Stephen Warren
[not found] ` <56C3977E.8050001-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-22 6:24 ` [PATCH 0/3] Fix headphone detection on Acer Chromebook 13 Jonathan Tinkham
[not found] ` <1456122253-3039-1-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-22 6:24 ` [PATCH 1/3] dt/bindings: Add 'nvidia,hd-no-invert' option Jonathan Tinkham
[not found] ` <1456122253-3039-2-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-22 19:48 ` Stephen Warren
[not found] ` <56CB6624.6030600-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-22 21:12 ` Jonathan Tinkham
2016-02-23 17:19 ` [PATCH] sound/soc/tegra: tegra_max98090: fix hp detect on Chromebook 13 Jonathan Tinkham
[not found] ` <1456247985-5563-1-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-23 17:19 ` [PATCH] sound/soc/tegra: tegra_max98090: Invert headphone by GPIO flag Jonathan Tinkham
[not found] ` <1456247985-5563-2-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-23 17:35 ` Stephen Warren
[not found] ` <56CC9860.2060003-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-24 16:42 ` Jonathan Tinkham
[not found] ` <56CDDD82.7040402-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-24 16:45 ` Stephen Warren
[not found] ` <56CDDE35.1010408-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-24 16:51 ` Jonathan Tinkham
2016-03-02 17:43 ` [PATCH] AsoC: tegra_max98090: honor headphone detect GPIO polarity Jonathan Tinkham
[not found] ` <1456940623-1496-1-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-03 18:37 ` Stephen Warren
[not found] ` <56D8845A.4050704-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-03-04 17:42 ` Jonathan Tinkham
[not found] ` <56D9C921.7080802-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-04 17:47 ` Stephen Warren
2016-02-24 3:25 ` [PATCH] sound/soc/tegra: tegra_max98090: fix hp detect on Chromebook 13 Mark Brown
[not found] ` <20160224032552.GJ18327-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-02-24 16:43 ` Jonathan Tinkham
2016-02-22 6:24 ` [PATCH 2/3] sound/soc/tegra: tegra_max98090: add 'nvidia,hd-no-invert' option Jonathan Tinkham
2016-02-22 6:24 ` [PATCH 3/3] ARM: tegra: Do not invert nyan headphone detection signal Jonathan Tinkham
2016-02-22 9:46 ` [PATCH 0/3] Fix headphone detection on Acer Chromebook 13 Mark Brown
2016-02-04 5:31 ` Jonathan Tinkham [this message]
[not found] ` <1454563862-1971-3-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-04 16:38 ` [PATCH 2/4] sound/soc: tegra_max98090: rename headphone jack DAPM Stephen Warren
2016-02-04 5:31 ` [PATCH 3/4] sound/soc: tegra_max98090: document headphone jack rename Jonathan Tinkham
[not found] ` <1454563862-1971-4-git-send-email-sctincman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-04 16:39 ` Stephen Warren
[not found] ` <56B37EAC.5010101-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2016-02-04 19:22 ` Dylan Reid
2016-02-04 5:31 ` [PATCH 4/4] soc/sound: tegra_max98090: update dts affected by rename Jonathan Tinkham
2016-02-04 18:03 ` [PATCH 0/4] Fix headphone detection on Acer Chromebook 13 Mark Brown
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=1454563862-1971-3-git-send-email-sctincman@gmail.com \
--to=sctincman-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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).