From patchwork Wed Jul 26 00:35:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 108724 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp198578qge; Tue, 25 Jul 2017 17:35:44 -0700 (PDT) X-Received: by 10.99.36.193 with SMTP id k184mr16058129pgk.406.1501029343877; Tue, 25 Jul 2017 17:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501029343; cv=none; d=google.com; s=arc-20160816; b=F5jX64kg2m8Q86SKfLhXXV2VCKGjCSWcWxJqbN+YkakErYsXKsXfKcge68hvU9RIOf xwxbsE5medbazAv9uIgbV0u5iPiJZUIpBw/wWPtQz1yZsI65iOkbVHjDJDc5OAd0T2Bz xLxgBC6OG38cYaCxZ+8J0tpCbaY05KOQi3KMyphDulFc50xX67ROvjaaGLQNA/FOfkbp z7jBfZhfrlJvkhVUpOkMK6CgURGm4rh+lF4e3UI4Kp8qd8vWSyPVgyXqIrxmYrVTPGNQ f0tWUiXpyJr/NGsNFwQREPM2HPLfuHACQLkjR+Jtj0orNRAzNKAZq8SB4EEIFY/LIsWv npfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=zh4eHiChyDJuxqsYA8yde9ls/Smrn98yB6Ap/L/1oyw=; b=Cani3G93InSHH+Pw5xlP00XftnkG4moQvw8qAY2hhYZ5KwPh+1+ES9ab0F4t+78qlY F+0g80cav+42sVj1j+7JY1lI7u6ml8L8K5tCAbPFi1PAi6vLXqrbUkmm35wccmbm7UkQ hKqkw0uqvKC/lBPdxgg0toG7WsGHUvVBoGBLahHPzY+HisH0wj4drKuVgjZnVYDj5Oze ECvYWV+H6R6IOSalTpNFLCqr3R7v8mqjZYLiDrXfPfz5MfHNKdGu9MeTginFzc8kYJWk NajuMnrF57PqipNFsoar49oF9YdxqnvA2y5yzXPxKlpwISQQqFm/GOpg0Jxxp9mv0cS0 jHhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=JJDhsqUv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n9si8888327pge.35.2017.07.25.17.35.43; Tue, 25 Jul 2017 17:35:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=JJDhsqUv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751925AbdGZAfl (ORCPT + 26 others); Tue, 25 Jul 2017 20:35:41 -0400 Received: from mail-it0-f45.google.com ([209.85.214.45]:37806 "EHLO mail-it0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751595AbdGZAfg (ORCPT ); Tue, 25 Jul 2017 20:35:36 -0400 Received: by mail-it0-f45.google.com with SMTP id v127so60229564itd.0 for ; Tue, 25 Jul 2017 17:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zh4eHiChyDJuxqsYA8yde9ls/Smrn98yB6Ap/L/1oyw=; b=JJDhsqUvN7ieQwoKGtddONu/kdTT9tpNY8zRD7E1POVGuRXZ70htpkxbPPIh7MJZ7R z0NRPxqhqz3zs0w6oHLh1/TV9A/VaNKZBwHD9RMyO2KKglWgE7g6xsrM8WOrdRsLkEge N86ZxD4Qj26gZQ8yEO4tu3wMUpGYZJtLWRhAc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zh4eHiChyDJuxqsYA8yde9ls/Smrn98yB6Ap/L/1oyw=; b=Ze/mSTEQDWxcuiW6AquH5kg0dd/pvLhn94+OYqIaS6JDtEfeBo4eWjQ4djJMRWHfWa XjdcHw3WsxzOfTMByMvT7Pxrjn7wvuUbwOfp812wjq0/0vpbpcoFTdAi2KzTATfKzPP0 P9q+w0hkJWFv8v02pkpK2uOiuGnITuS1iyuc4CcZh7h0bGuHQHpOZyrPZSe7Eu2wYgDF erY+tGeO4uxRQ1duNsZm0E2iNo+3EC2O2fk7EKareCk1Mb75sZzC/CD0kpxaI8HuLJ03 5KuI56FbYPnhojSqXbP0VDPdWo7hUcH6B+fLaFlF7HgxHI+ZaPVO9Siw7cqZBJ/hstK5 kxhg== X-Gm-Message-State: AIVw110l3MJ9grs0CyttwK2h/kkD88vY4mmJEPwPw3eQ6xNBJ2+e1zvi ZlUCxmBjHEWvpkkf X-Received: by 10.36.55.145 with SMTP id r139mr13195807itr.117.1501029335533; Tue, 25 Jul 2017 17:35:35 -0700 (PDT) Received: from localhost.localdomain (static.8.26.4.46.clients.your-server.de. [46.4.26.8]) by smtp.gmail.com with ESMTPSA id l69sm5097373ioi.49.2017.07.25.17.35.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 17:35:35 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: Mark Brown , Banajit Goswami , alsa-devel@alsa-project.org Cc: Jaroslav Kysela , Takashi Iwai , Patrick Lai , linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v1 6/6] ASoC: qcom: apq8016-sbc: Add support to Headset JACK Date: Wed, 26 Jul 2017 02:35:12 +0200 Message-Id: <20170726003512.18965-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170726003512.18965-1-srinivas.kandagatla@linaro.org> References: <20170726003512.18965-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla 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 --- sound/soc/qcom/apq8016_sbc.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) -- 2.9.3 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 #include #include +#include #include +#include #include +#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;