From patchwork Mon Sep 17 00:57:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 146815 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3197062ljw; Sun, 16 Sep 2018 17:58:22 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ2e/nzdFPMvHHpAMp1zGEOQT9Yu1oyDm26YNas8tSdRk3pb9w4imMCi+yRSoDy9jami546 X-Received: by 2002:a63:5ec1:: with SMTP id s184-v6mr21672600pgb.26.1537145902640; Sun, 16 Sep 2018 17:58:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537145902; cv=none; d=google.com; s=arc-20160816; b=YhgKPuM7rpev/aV3EXd/9995nfCWWF+COzUYEh1bMP+Lf8xuQadq8xM4dAOiKiZhcw bcR69SkKUy2QmP2a8Th+GO2mpO6J/lnF1eUy3+buimEFqR+jsXY+hcqqueBhhXdnbioM JBYDLQGyFUjKb1ThfCVZ3a6l9kPf67vc9FxOiqQLq/Q8sKebzUngdxm/fdEtJkf2ODm1 04rZN9KfBCQvwqQMoNcrFP4+DeZPhfu3qdxTkzT3xlG+6kLTJWjrFvU5EG2/oYYZymqa 4ZVN5uYYdcC2+YWgCr+w5kSvIWLLci+5qtpV+XU8Th0mHFRFcJ0kDLPa1UDJP7Xudx74 jfVw== 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; bh=eJH11aBb5GlguuXS0xBxC+fzG4Kc/S3a2ZBQ9aPxUZQ=; b=UF8Eu8y1jeUlkmWbTBi1CaetTudy5WzO/vwlwXpkc+hSRf0ME+K6az5wzOHYVafzUU HuKRKcCR7WpRgLr1OR5KjWBPDcKqWz3VBy3V6qf03iYm1Av7fpL4csETcbXJ+zm0mh+H vrlME0nVbSEW/ZROsW5Uv/6mY3H1WLBnvC+yU5D5C+I0sl3/elr2CM4JlyNXzkpxBoy+ qbkw5fjqkx/tDYXkkrSckjLyp/79cQ2dc2VzCPcxEOb1b2RnUf5gvOPMGb9Wh3lGIE92 OJxoW2qixS5XRkyvN8YLXe5i+wzkOy6j8vBXsxe7tiOAky95yb264SSH2H+aIYfDu8Gk Q5ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KvmAE2K1; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 m10-v6si12858978pgv.374.2018.09.16.17.58.22; Sun, 16 Sep 2018 17:58:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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.s=google header.b=KvmAE2K1; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 S1728520AbeIQGXN (ORCPT + 6 others); Mon, 17 Sep 2018 02:23:13 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:40483 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728505AbeIQGXM (ORCPT ); Mon, 17 Sep 2018 02:23:12 -0400 Received: by mail-it0-f68.google.com with SMTP id h23-v6so8894789ita.5 for ; Sun, 16 Sep 2018 17:58:19 -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=eJH11aBb5GlguuXS0xBxC+fzG4Kc/S3a2ZBQ9aPxUZQ=; b=KvmAE2K1QPiVuM0vacAsHLFyQN0Yg3RlgWSBKLvPjztxElR5VxAbIyg96z2S6a9zNM QsOsvLhGc9v0dguuCHLkUiiT6RbniOu0NPl56r94CnhrzwD92zDdqNKLUJFUUABcvNac rYe5EpXv69pnU5yMECXbjyoLaKlc/Uniq8j4Q= 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=eJH11aBb5GlguuXS0xBxC+fzG4Kc/S3a2ZBQ9aPxUZQ=; b=kzKH0A/wZxjO0bjnNIIboKDh/hHMLRj4MlXdOojNXDw16I5k04Pn7SaRFn5gIhSMZD VXOyoYl3qsP3LYDMoJhXe7nwIFoCrPPw28hXPSOGGY+I3gt2ych738c0SFYgyJ8QKDqr sWsMxed12wu88hNCpHRq3335QCX+9x+oRYsonoTWd1qxs7VICqn065hiiBpODtrHyiIt iITMxpZQMMUqjQ5x/veSx3RmQiO8g6DKLhfvyWh4ENBnq5lyCc/MNvmj+U0F/MCKDz3s W7rDg/e4JCZLDn700M3f2p1KFX2ABHYzfKn4097OMhA98uKov+HvS+1qg0X//xCx1I33 kU4g== X-Gm-Message-State: APzg51B00ND1kgVgJQqzuwRV/6SPbnGQ6KL0/LMYnwg7pXcLYI2ASqHD +Skfh6zNaVcSI9XgBG5hsq6+EA== X-Received: by 2002:a24:1d52:: with SMTP id 79-v6mr10305796itj.142.1537145898993; Sun, 16 Sep 2018 17:58:18 -0700 (PDT) Received: from localhost.localdomain ([209.82.80.116]) by smtp.gmail.com with ESMTPSA id f64-v6sm829972ite.4.2018.09.16.17.58.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Sep 2018 17:58:18 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: lee.jones@linaro.org, robh+dt@kernel.org, broonie@kernel.org Cc: mark.rutland@arm.com, lgirdwood@gmail.com, bgoswami@codeaurora.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, vkoul@kernel.org, alsa-devel@alsa-project.org, Srinivas Kandagatla Subject: [PATCH v4 13/14] ASoC: apq8096: add headset JACK support Date: Sun, 16 Sep 2018 17:57:26 -0700 Message-Id: <20180917005727.32728-14-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180917005727.32728-1-srinivas.kandagatla@linaro.org> References: <20180917005727.32728-1-srinivas.kandagatla@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Srinivas Kandagatla Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/apq8096.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) -- 2.9.3 diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c index 66a28c2..daad43f 100644 --- a/sound/soc/qcom/apq8096.c +++ b/sound/soc/qcom/apq8096.c @@ -5,14 +5,21 @@ #include #include #include +#include #include #include +#include #include "common.h" #define SLIM_MAX_TX_PORTS 16 #define SLIM_MAX_RX_PORTS 16 #define WCD9335_DEFAULT_MCLK_RATE 9600000 +struct apq8096_card_data { + struct snd_soc_jack jack; + bool jack_setup; +}; + static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { @@ -68,6 +75,7 @@ static struct snd_soc_ops apq8096_ops = { static int apq8096_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct apq8096_card_data *data = snd_soc_card_get_drvdata(rtd->card); /* * Codec SLIMBUS configuration @@ -80,6 +88,8 @@ static int apq8096_init(struct snd_soc_pcm_runtime *rtd) unsigned int tx_ch[SLIM_MAX_TX_PORTS] = {128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143}; + struct snd_soc_card *card = rtd->card; + int rval; snd_soc_dai_set_channel_map(codec_dai, ARRAY_SIZE(tx_ch), tx_ch, ARRAY_SIZE(rx_ch), rx_ch); @@ -87,6 +97,38 @@ static int apq8096_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dai_set_sysclk(codec_dai, 0, WCD9335_DEFAULT_MCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); + if (!data->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, + &data->jack, NULL, 0); + + if (rval < 0) { + dev_err(card->dev, "Unable to add Headphone Jack\n"); + return rval; + } + + jack = data->jack.jack; + + snd_jack_set_key(jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); + 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); + data->jack_setup = true; + } + + rval = snd_soc_component_set_jack(codec_dai->component, + &data->jack, NULL); + if (rval != 0 && rval != -ENOTSUPP) { + dev_warn(card->dev, "Failed to set jack: %d\n", rval); + return rval; + } + return 0; } @@ -107,6 +149,7 @@ static void apq8096_add_be_ops(struct snd_soc_card *card) static int apq8096_platform_probe(struct platform_device *pdev) { + struct apq8096_card_data *data; struct snd_soc_card *card; struct device *dev = &pdev->dev; int ret; @@ -115,8 +158,15 @@ static int apq8096_platform_probe(struct platform_device *pdev) if (!card) return -ENOMEM; + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) { + kfree(card); + return -ENOMEM; + } + card->dev = dev; dev_set_drvdata(dev, card); + snd_soc_card_set_drvdata(card, data); ret = qcom_snd_parse_of(card); if (ret) { dev_err(dev, "Error parsing OF data\n"); @@ -134,16 +184,19 @@ static int apq8096_platform_probe(struct platform_device *pdev) kfree(card->dai_link); err: kfree(card); + kfree(data); return ret; } static int apq8096_platform_remove(struct platform_device *pdev) { struct snd_soc_card *card = dev_get_drvdata(&pdev->dev); + struct apq8096_card_data *data = snd_soc_card_get_drvdata(card); snd_soc_unregister_card(card); kfree(card->dai_link); kfree(card); + kfree(data); return 0; }