All of lore.kernel.org
 help / color / mirror / Atom feed
From: srinivas.kandagatla@linaro.org
To: Mark Brown <broonie@kernel.org>,
	Banajit Goswami <bgoswami@codeaurora.org>,
	alsa-devel@alsa-project.org
Cc: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	Patrick Lai <plai@codeaurora.org>,
	linux-kernel@vger.kernel.org,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH v1 6/6] ASoC: qcom: apq8016-sbc: Add support to Headset JACK
Date: Wed, 26 Jul 2017 02:35:12 +0200	[thread overview]
Message-ID: <20170726003512.18965-7-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20170726003512.18965-1-srinivas.kandagatla@linaro.org>

From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

This patch adds support to Headset JACK, also provides board specific
vref ranges for mbhc buttons to be detected.

This headset supports both 3 pole and 5 pole headset type and 5 buttons.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 sound/soc/qcom/apq8016_sbc.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c
index f07aa1e..ccb3620 100644
--- a/sound/soc/qcom/apq8016_sbc.c
+++ b/sound/soc/qcom/apq8016_sbc.c
@@ -21,12 +21,18 @@
 #include <linux/platform_device.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
+#include <sound/jack.h>
 #include <sound/soc.h>
+#include <uapi/linux/input-event-codes.h>
 #include <dt-bindings/sound/apq8016-lpass.h>
+#include "../codecs/msm8916-wcd.h"
 
 struct apq8016_sbc_data {
 	void __iomem *mic_iomux;
 	void __iomem *spkr_iomux;
+	struct snd_soc_jack jack;
+	struct msm8916_wcd_mbhc_data mbhc_data;
+	bool jack_setup;
 	struct snd_soc_dai_link dai_link[];	/* dynamically allocated */
 };
 
@@ -43,6 +49,7 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
 	struct snd_soc_dai_link *dai_link = rtd->dai_link;
 	struct snd_soc_card *card = rtd->card;
 	struct apq8016_sbc_data *pdata = snd_soc_card_get_drvdata(card);
+	struct msm8916_wcd_mbhc_data *data;
 	int i, rval;
 
 	switch (cpu_dai->id) {
@@ -70,6 +77,45 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
 
 	}
 
+	if (!pdata->jack_setup) {
+		struct snd_jack *jack;
+
+		rval = snd_soc_card_jack_new(card, "Headset Jack",
+					     SND_JACK_HEADSET |
+					     SND_JACK_HEADPHONE |
+					     SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+					     SND_JACK_BTN_2 | SND_JACK_BTN_3 |
+					     SND_JACK_BTN_4,
+					     &pdata->jack, NULL, 0);
+
+		if (rval < 0) {
+			dev_err(card->dev, "Unable to add Headphone Jack\n");
+			return rval;
+		}
+
+		jack = pdata->jack.jack;
+
+		snd_jack_set_key(jack, SND_JACK_BTN_0, KEY_MEDIA);
+		snd_jack_set_key(jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
+		snd_jack_set_key(jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
+		snd_jack_set_key(jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
+
+		/* board specific vref thresholds in mv */
+		data = &pdata->mbhc_data;
+		data->vref_btn_cs[0] = 75;
+		data->vref_btn_micb[0] = 75;
+		data->vref_btn_cs[1] = 150;
+		data->vref_btn_micb[1] = 150;
+		data->vref_btn_cs[2] = 237;
+		data->vref_btn_micb[2] = 237;
+		data->vref_btn_cs[3] = 450;
+		data->vref_btn_micb[3] = 450;
+		data->vref_btn_cs[4] = 500;
+		data->vref_btn_micb[4] = 500;
+
+		pdata->jack_setup = true;
+	}
+
 	for (i = 0 ; i < dai_link->num_codecs; i++) {
 		struct snd_soc_dai *dai = rtd->codec_dais[i];
 
@@ -81,6 +127,12 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
 			dev_warn(card->dev, "Failed to set mclk: %d\n", rval);
 			return rval;
 		}
+		rval = snd_soc_codec_set_jack(codec, &pdata->jack,
+					      &pdata->mbhc_data);
+		if (rval != 0 && rval != -ENOTSUPP) {
+			dev_warn(card->dev, "Failed to set jack: %d\n", rval);
+			return rval;
+		}
 	}
 
 	return 0;
-- 
2.9.3

      parent reply	other threads:[~2017-07-26  0:35 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-26  0:35 [PATCH v1 0/6] ASoC: codecs: msm8916-wcd-analog: Add support to MBHC srinivas.kandagatla
2017-07-26  0:35 ` srinivas.kandagatla
2017-07-26  0:35 ` [PATCH v1 1/6] ASoC: jack: fix snd_soc_codec_set_jack return error srinivas.kandagatla
2017-08-08 11:06   ` Applied "ASoC: jack: fix snd_soc_codec_set_jack return error" to the asoc tree Mark Brown
2017-08-08 11:06     ` Mark Brown
2017-07-26  0:35 ` [PATCH v1 2/6] ASoC: codecs: msm8916-analog: fix DIG_CLK_CTL_RXD3_CLK_EN define srinivas.kandagatla
2017-07-28 13:36   ` Mark Brown
2017-07-28 13:36     ` Mark Brown
2017-07-26  0:35 ` [PATCH v1 3/6] ASoC: codecs: msm8916-wcd-analog: move codec reset to probe srinivas.kandagatla
2017-07-26  0:35   ` srinivas.kandagatla
2017-07-28 13:40   ` Mark Brown
2017-07-28 14:06     ` Srinivas Kandagatla
2017-08-10 15:42   ` Applied "ASoC: codecs: msm8916-wcd-analog: move codec reset to probe" to the asoc tree Mark Brown
2017-08-10 15:42     ` Mark Brown
2017-07-26  0:35 ` [PATCH v1 4/6] ASoC: codecs: msm8916-wcd-analog: set default micbias voltage to 1.8 srinivas.kandagatla
2017-07-28 13:40   ` Mark Brown
2017-07-28 13:54     ` Srinivas Kandagatla
2017-07-28 13:54       ` Srinivas Kandagatla
2017-07-28 14:01       ` Mark Brown
2017-07-28 14:01         ` Mark Brown
2017-07-28 14:45         ` Srinivas Kandagatla
2017-07-28 14:45           ` Srinivas Kandagatla
2017-07-31 10:07           ` Mark Brown
2017-07-31 10:07             ` Mark Brown
2017-07-31 10:27             ` Srinivas Kandagatla
2017-07-31 10:27               ` Srinivas Kandagatla
2017-07-26  0:35 ` [PATCH v1 5/6] ASoC: codecs: msm8916-wcd-analog: add MBHC support srinivas.kandagatla
2017-07-28 13:51   ` Mark Brown
2017-07-28 14:12     ` Srinivas Kandagatla
2017-07-28 14:12       ` Srinivas Kandagatla
2017-07-26  0:35 ` srinivas.kandagatla [this message]

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=20170726003512.18965-7-srinivas.kandagatla@linaro.org \
    --to=srinivas.kandagatla@linaro.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=bgoswami@codeaurora.org \
    --cc=broonie@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=plai@codeaurora.org \
    --cc=tiwai@suse.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.