All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@kernel.org>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Kevin Strasser <kevin.strasser@intel.com>
Subject: [PATCH 4/6] ASoC: Intel: byt-max98090: Fix jack type in order to report correctly
Date: Mon, 23 Jun 2014 16:29:40 +0300	[thread overview]
Message-ID: <1403530182-5400-4-git-send-email-jarkko.nikula@linux.intel.com> (raw)
In-Reply-To: <1403530182-5400-1-git-send-email-jarkko.nikula@linux.intel.com>

Pass actual jack type bitmask to snd_soc_jack_new() in order to report
also microphone detections and not only headphone. While at it change also
jack name and pass also SND_JACK_LINEOUT type.

Reported-by: Jin Yao <yao.jin@intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 sound/soc/intel/byt-max98090.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c
index 165ab6d6c4a3..3e2e7152ae66 100644
--- a/sound/soc/intel/byt-max98090.c
+++ b/sound/soc/intel/byt-max98090.c
@@ -108,7 +108,8 @@ static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime)
 	}
 
 	/* Enable jack detection */
-	ret = snd_soc_jack_new(codec, "Headphone", SND_JACK_HEADPHONE, jack);
+	ret = snd_soc_jack_new(codec, "Headset",
+			       SND_JACK_LINEOUT | SND_JACK_HEADSET, jack);
 	if (ret)
 		return ret;
 
-- 
2.0.0

  parent reply	other threads:[~2014-06-23 13:30 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-23 13:29 [PATCH 1/6] ASoC: Intel: byt-max98090: Move MICBIAS widget to supply of Headset Mic Jarkko Nikula
2014-06-23 13:29 ` [PATCH 2/6] ASoC: Intel: byt-max98090: Fix mic detect GPIO polarity Jarkko Nikula
2014-06-23 13:29 ` [PATCH 3/6] ASoC: Intel: byt-max98090: Do not report SND_JACK_LINEIN Jarkko Nikula
2014-06-23 13:29 ` Jarkko Nikula [this message]
2014-06-23 13:29 ` [PATCH 5/6] ASoC: Intel: byt-max98090: Do not change speaker and DMIC with jack state Jarkko Nikula
2014-06-23 13:29 ` [PATCH 6/6] ASoC: Intel: byt-max98090: Do not enable MAX98090 microphone detection Jarkko Nikula
2014-06-24 15:21 ` [PATCH 1/6] ASoC: Intel: byt-max98090: Move MICBIAS widget to supply of Headset Mic 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=1403530182-5400-4-git-send-email-jarkko.nikula@linux.intel.com \
    --to=jarkko.nikula@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=kevin.strasser@intel.com \
    --cc=lgirdwood@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.