From patchwork Tue Sep 4 10:25:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 145893 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3488530ljw; Tue, 4 Sep 2018 03:27:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYl5yHMKsKiMYZCaLzciRiYfvuM7wRZ1jjArhwMnoLvVGYd0naCJb24/zl8+tQScCuUbTpz X-Received: by 2002:a63:5b63:: with SMTP id l35-v6mr30826103pgm.50.1536056870715; Tue, 04 Sep 2018 03:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536056870; cv=none; d=google.com; s=arc-20160816; b=INqQfqHEL9oocfbw4p/NltMUlQTtm707wOqVt9hCFYEsXYCB9Fr2sRzsJIZLAYpDML 6wTVx6IB06VCQU+4x3t6KICeq75hJKwC26guqWo/BjEY84UGXMM7wqmhVCayQO0oe1BR ErV9h1HpCvCs03KM7RKrV2e9D/kQ/XygNqN3/+cjRCuAQTPE8AyD1T5DB7vpHBpK2Bxg Oy+78jrAYOIWMnrM/QWCC9OzxIMGf1Wq9vLzHlkAxGDwTsa7/XzXrotUpj5lJpEvgGdF D/E3MBFCqtzS3k1Mc5Il2t8kBoYKTj+ytJwhuI8lusEIvUNGxQBvlPDnzSzFg4/Zyq8B k3vQ== 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=kDTb19RTWifFuLfVBk7DXBD9s0ll9MuJJWXgCHepOhA=; b=iYLhGDbbb2lMFpmv5p3n8+Uq2/fIR47UVyqYz0nLRRqkuoj4NL2WZ4VZFGWUlLzVKi gIwrVH/HUwWHKgdrfe7TJKb3IXhER0xcvuyeaJgmklpkqEswqgk5HJvqofHPUiCNN3eB y/VHCcD7jB5YacWrPwZxSK9rf8UK842qQEM+Y9M9QWE48gW7UGKgNHYWDxsguBao/NvX 7tr5i7mW1kqb/PE278t9U2hlRm0/BDGi89DXK0YtGI2ilX5T0YTLdPHEyriU0h/eXUHL BgOUsE7M2DEWY3JCVeGKJPmgaP1i4wDJihY/9qJRHeDugVz1OuPnHeGC2ykAhU/oSPS6 mYwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cN0YocF1; 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 y28-v6si21078060pga.485.2018.09.04.03.27.50; Tue, 04 Sep 2018 03:27:50 -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=cN0YocF1; 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 S1727216AbeIDOwR (ORCPT + 6 others); Tue, 4 Sep 2018 10:52:17 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52596 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727617AbeIDOwR (ORCPT ); Tue, 4 Sep 2018 10:52:17 -0400 Received: by mail-wm0-f67.google.com with SMTP id y139-v6so3787309wmc.2 for ; Tue, 04 Sep 2018 03:27:47 -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=kDTb19RTWifFuLfVBk7DXBD9s0ll9MuJJWXgCHepOhA=; b=cN0YocF1mczPl6T85Z2jLVC4dfnPo63mU0ibDJE5hgsO97J42fCAolUQ/6dDWN50Ch h4hwPZFyi3+V+s62YfbVOkwnRGlVmhWn+dq5NP68XYv4L7k3Iisj85yxzo/B3p3Selj+ HJo5dhmS7ff+DEJhM6H7zaaM5KsbtCKKyoCPE= 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=kDTb19RTWifFuLfVBk7DXBD9s0ll9MuJJWXgCHepOhA=; b=kUEbrT5z3MSPhrOOd/x2LHK6LBjBv+VdaSEdctM+CzRxGgoRgk+KK8wN6E0LsO4mgu TpxAzcCE4MOxo5ufw8At6SS1bxgQ/EYApT2MzJ6ThwvMPE5HQDsZf21W/OlazbQ9p1cJ /uMFX1hRPqMWcW+Jh4DnYoxG4vpCtMDKTAeC7rFXNkHM68m/eiV+8htU8pHfLhpS5juQ tVM7yPrAXvv7BzC4x4c+CT5unObeUIQInIaepye/74/D1xxbJByNNPbh0oPjCDv55N7s 9KQE/HGHqvSJcLL1l6Fz02qpKmrxFa8WYo5M3jZ2+pU28CXdzwTnVPH2Rr0nLqX89GD3 T//w== X-Gm-Message-State: APzg51Bccs0ILFF1ySDLZk8LkYIH1QUZhHAbP6NU1JZKDI+LCbN8dQmp 7wzaJXGU+QUc+dWE4cE7JOdxMg== X-Received: by 2002:a1c:e70b:: with SMTP id e11-v6mr2081581wmh.22.1536056867016; Tue, 04 Sep 2018 03:27:47 -0700 (PDT) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id g129-v6sm16903325wmf.42.2018.09.04.03.27.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Sep 2018 03:27:46 -0700 (PDT) From: Srinivas Kandagatla 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 v3 13/13] ASoC: apq8096: add headset JACK support Date: Tue, 4 Sep 2018 11:25:00 +0100 Message-Id: <20180904102500.30318-14-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180904102500.30318-1-srinivas.kandagatla@linaro.org> References: <20180904102500.30318-1-srinivas.kandagatla@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/apq8096.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) -- 2.18.0 diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c index db07e9b62daf..78b245261477 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) { @@ -65,6 +72,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 @@ -77,6 +85,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); @@ -84,6 +94,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; } @@ -104,6 +146,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; @@ -112,8 +155,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"); @@ -131,16 +181,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; }