From patchwork Wed Aug 2 13:17:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 109217 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp2772390qge; Wed, 2 Aug 2017 06:18:18 -0700 (PDT) X-Received: by 10.98.85.199 with SMTP id j190mr22339097pfb.270.1501679898465; Wed, 02 Aug 2017 06:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501679898; cv=none; d=google.com; s=arc-20160816; b=KgXnQXyAgNrDH7QNPMT33SjR90Yg8DxaOKjQwYzjqL0StlOAMgPgtQpe45yqGhiySq PV4y2YyBAJbcLKQy3FaO0BzoXwf+E97lXuo1UoW13zPk30B0WJyndQGRv0GlBu/Beetn rVJH9cinvjIPCJoBdJcaIQUh5nZ5ssl9ic3iiBesLRtVJaBaHCARVDZ3h0p3qqNAfH6L Tk5v77g97SvnWsjkfKUC9L/Kl3oDM+bi+QTy2pGBFitp0VLCUHRTPHfMllpXoeHPrbt+ fapUbQZEwviJO8nxpGOcmGEVvemZhcWtfvpyviRNyjrxJwoftX5+T2C1NK70dayCJvjb +/rQ== 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=cOm/IjgGXRkyQLj1buXrh8C1fnN+YJoGn/s6KmGiC8w=; b=NBlX4cxpzUw68S2FyDVDn+aU9ou+pR4oEFd7kLYX9ztccRC/2gSYHy7picdMGeAqko GHyCyk4IfX8XFBRXlPR18Zxk82q5S2gfAm5GZ/fRgqilT0P8qkk4B5BAe7dKsACINFh8 OIld6dBjtPs0eJ7LjqM181PUSxfQ8ugSy9rPS6NfmssDA6q/38/8aXb455yjgymqpLGE oI05vkfZ/EGjZnCHPVKfpYRS+HzYKQzZp3rRXbMhOhD0Ns03bVV4HCOKCN7JGP5MtbdD L6vyYRdnoz3DPb9vthQcemx5pMYq3gvzR06NIdrwiJ+ahFTralIg5omEZLfDxxZO8lJF uzAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=BE3rq3Jj; 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 j91si21285400pld.637.2017.08.02.06.18.18; Wed, 02 Aug 2017 06:18:18 -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=BE3rq3Jj; 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 S1752179AbdHBNSO (ORCPT + 25 others); Wed, 2 Aug 2017 09:18:14 -0400 Received: from mail-it0-f50.google.com ([209.85.214.50]:38552 "EHLO mail-it0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbdHBNSJ (ORCPT ); Wed, 2 Aug 2017 09:18:09 -0400 Received: by mail-it0-f50.google.com with SMTP id h199so24298859ith.1 for ; Wed, 02 Aug 2017 06:18:09 -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=cOm/IjgGXRkyQLj1buXrh8C1fnN+YJoGn/s6KmGiC8w=; b=BE3rq3JjrwdLnb0VJC5AlJx9FP/wbVTv/CHAvq8ngRHWFQFnYmvk8869mJx2QhwIkT 0OQ4ryxx74wxXiGR8/9qIyPRzZLqTzaehNE39SnEDvZisoP/9go87tuccJ+4iTxPE3UF 45odNMWT6kODbhnzCryWCSpg85ZgCdgK4A020= 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=cOm/IjgGXRkyQLj1buXrh8C1fnN+YJoGn/s6KmGiC8w=; b=mfdNc/0U5gpdh1bIbgyReSfM2RezjvJirkhY/pqbRK10LTTTcdbLSVfAREGCKNTkfI HpYEHrxGLp4aYp0tUoBdAW+5QxCLcMxIiIruVbdiqyAOliq2T5Qvazxuqa5dxVo4K5MY SOGokapmrbCtT07vqK1s3bw5dFwqDyjjO8mGDzJBNnhsU9xVvq3h3VkIxBzWi4mVzyiN MXsoAgexemGN5IUTN9iuT4i+YJg7fvphDjVlOxb/y96ZyBmEijBrFm+B7WBOAX1wC87u doGRWNylcbq5HlRFImqUvTO71f5E+j3nNXyC6zVQxtCoWG9TnKH8JNh9xp+8kZpDHhAS A9TQ== X-Gm-Message-State: AIVw112QXrG/UmCwcJrxSeLGv/i2Ci9dnia0+oOtWy8ThF8O9IE4HZqn 5tp+DHtRoeEh3Ve64f05xA== X-Received: by 10.36.253.135 with SMTP id m129mr5710496ith.152.1501679889171; Wed, 02 Aug 2017 06:18:09 -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 f8sm1406724itc.26.2017.08.02.06.18.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Aug 2017 06:18:08 -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 v3 3/3] ASoC: codecs: msm8916-wcd-digital: add CIC filter source selection path Date: Wed, 2 Aug 2017 15:17:48 +0200 Message-Id: <20170802131748.10958-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170802131748.10958-1-srinivas.kandagatla@linaro.org> References: <20170802131748.10958-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 fixes a missing selection of DMIC in CIC filter source path to dapm route. Without this patch dmic is not functional. Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/msm8916-wcd-digital.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) -- 2.9.3 diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index 825cc7d..d2993e7 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c @@ -218,6 +218,8 @@ static const char *const rx_mix1_text[] = { static const char *const dec_mux_text[] = { "ZERO", "ADC1", "ADC2", "ADC3", "DMIC1", "DMIC2" }; + +static const char *const cic_mux_text[] = { "AMIC", "DMIC" }; static const char *const rx_mix2_text[] = { "ZERO", "IIR1", "IIR2" }; static const char *const adc2_mux_text[] = { "ZERO", "INP2", "INP3" }; @@ -256,11 +258,21 @@ static const struct soc_enum dec1_mux_enum = SOC_ENUM_SINGLE( static const struct soc_enum dec2_mux_enum = SOC_ENUM_SINGLE( LPASS_CDC_CONN_TX_B1_CTL, 3, 6, dec_mux_text); +/* CIC */ +static const struct soc_enum cic1_mux_enum = SOC_ENUM_SINGLE( + LPASS_CDC_TX1_MUX_CTL, 0, 2, cic_mux_text); +static const struct soc_enum cic2_mux_enum = SOC_ENUM_SINGLE( + LPASS_CDC_TX2_MUX_CTL, 0, 2, cic_mux_text); + /* RDAC2 MUX */ static const struct snd_kcontrol_new dec1_mux = SOC_DAPM_ENUM( "DEC1 MUX Mux", dec1_mux_enum); static const struct snd_kcontrol_new dec2_mux = SOC_DAPM_ENUM( "DEC2 MUX Mux", dec2_mux_enum); +static const struct snd_kcontrol_new cic1_mux = SOC_DAPM_ENUM( + "CIC1 MUX Mux", cic1_mux_enum); +static const struct snd_kcontrol_new cic2_mux = SOC_DAPM_ENUM( + "CIC2 MUX Mux", cic2_mux_enum); static const struct snd_kcontrol_new rx_mix1_inp1_mux = SOC_DAPM_ENUM( "RX1 MIX1 INP1 Mux", rx_mix1_inp_enum[0]); static const struct snd_kcontrol_new rx_mix1_inp2_mux = SOC_DAPM_ENUM( @@ -500,6 +512,8 @@ static const struct snd_soc_dapm_widget msm8916_wcd_digital_dapm_widgets[] = { SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0, &rx3_mix1_inp3_mux), + SND_SOC_DAPM_MUX("CIC1 MUX", SND_SOC_NOPM, 0, 0, &cic1_mux), + SND_SOC_DAPM_MUX("CIC2 MUX", SND_SOC_NOPM, 0, 0, &cic2_mux), /* TX */ SND_SOC_DAPM_MIXER("ADC1", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER("ADC2", SND_SOC_NOPM, 0, 0, NULL, 0), @@ -536,6 +550,8 @@ static const struct snd_soc_dapm_widget msm8916_wcd_digital_dapm_widgets[] = { /* Connectivity Clock */ SND_SOC_DAPM_SUPPLY_S("CDC_CONN", -2, LPASS_CDC_CLK_OTHR_CTL, 2, 0, NULL, 0), + SND_SOC_DAPM_MIC("Digital Mic1", NULL), + SND_SOC_DAPM_MIC("Digital Mic2", NULL), }; @@ -655,6 +671,11 @@ static const struct snd_soc_dapm_route msm8916_wcd_digital_audio_map[] = { {"AIF1 Capture", NULL, "I2S TX2"}, {"AIF1 Capture", NULL, "I2S TX3"}, + {"CIC1 MUX", "DMIC", "DEC1 MUX"}, + {"CIC1 MUX", "AMIC", "DEC1 MUX"}, + {"CIC2 MUX", "DMIC", "DEC2 MUX"}, + {"CIC2 MUX", "AMIC", "DEC2 MUX"}, + /* Decimator Inputs */ {"DEC1 MUX", "DMIC1", "DMIC1"}, {"DEC1 MUX", "DMIC2", "DMIC2"}, @@ -673,8 +694,8 @@ static const struct snd_soc_dapm_route msm8916_wcd_digital_audio_map[] = { {"DMIC1", NULL, "DMIC_CLK"}, {"DMIC2", NULL, "DMIC_CLK"}, - {"I2S TX1", NULL, "DEC1 MUX"}, - {"I2S TX2", NULL, "DEC2 MUX"}, + {"I2S TX1", NULL, "CIC1 MUX"}, + {"I2S TX2", NULL, "CIC2 MUX"}, {"I2S TX1", NULL, "TX_I2S_CLK"}, {"I2S TX2", NULL, "TX_I2S_CLK"},