From patchwork Tue Jul 25 23:48:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 108720 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp165870qge; Tue, 25 Jul 2017 16:48:56 -0700 (PDT) X-Received: by 10.99.42.141 with SMTP id q135mr21129577pgq.175.1501026536166; Tue, 25 Jul 2017 16:48:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501026536; cv=none; d=google.com; s=arc-20160816; b=YZfQXHwU3NJbl9TJc8SdczJFlyX1zq7+GPz/U/1+p173wQwiK0t1E3ew8FO4TNcAIr PrKzN0MKYlae89xs0UnR9CHmo1rr9u/k/DTI4CuRfgj96z0Kb6liizbfjdCqRQUgsV7Y C+X4WnIy0oOXy2It2f3r8UJwQYK2S+lvECS+o6HiYb/R9tem5NDI6FYHthK/rQdb+LfP 7nlPr+HtGwEAXp5v/EUBD/5yfJHEqPnxTz9kmKl/cjrSogGUWEzurtVGIzB1yst5R2h3 NbaxpbnRrr7it1xfaXwYECPjKQiYx4wbyw7klj8lEbaHlU3s3sav2wQMafOIW6CYMopz OnlQ== 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=N5H2FdV6Jp+NlacTQ4MLDuXnp39KCRKQATvkkiQsgPQ=; b=qlpAh3SrEDQzZmw82ItBRSEPaembxiNnDjGUIoPPgS7gGqC+s1DReckpxKauP88YzF 42KTvuBeD7vvnbG/gROIEDKSRlIuMsJWK6q0A+fLjgEue/Z+PiFnNS7J6VOVPBAJqbro sSJJqvuNleyNqIu7fqi5BLkF1rE3CZJ52Ue/WH1S5Bs6QZCZ9Pm72PAKx1pnecyiZMe4 RvlrCafaIQCG4gMP12Y8S0I0t5meTd86tzHlE2MIZsxxQ8DObQCCgA+Pt9oxqaCHK61f GJOAvK73GbsaRd3ctmdDH7NOfNcyWK5DHt/BHtjDX8MZzloenQHyN2xv9AvFq3+9tmI9 +zNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=Y9bt9Nw3; 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 a61si7492548plc.914.2017.07.25.16.48.55; Tue, 25 Jul 2017 16:48:56 -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=Y9bt9Nw3; 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 S1751850AbdGYXsx (ORCPT + 26 others); Tue, 25 Jul 2017 19:48:53 -0400 Received: from mail-io0-f172.google.com ([209.85.223.172]:34442 "EHLO mail-io0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751784AbdGYXsh (ORCPT ); Tue, 25 Jul 2017 19:48:37 -0400 Received: by mail-io0-f172.google.com with SMTP id l7so62185755iof.1 for ; Tue, 25 Jul 2017 16:48:37 -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=N5H2FdV6Jp+NlacTQ4MLDuXnp39KCRKQATvkkiQsgPQ=; b=Y9bt9Nw3UOgc6kl9eR6CArBkHoRAw8xaNu29unM7yX1wX9rWaxLqRisofc0xdRs1tZ OMYpGFz43/6LvHFAD7TLMKyxLo9bQdkWE06PsQA8G16kJG/K9CwHKKO1KJn7rcNESCo+ /twR7HjPDmd+IO4498EQqD74wYHXg1Z0RqzLA= 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=N5H2FdV6Jp+NlacTQ4MLDuXnp39KCRKQATvkkiQsgPQ=; b=oOjI31N9y3C6HyRhsSAQ7MZu6PWo2XbdM5RorD9VlN8n64kVrpJM7it+LlcO5TLlsY TE5igU17onfY1Z2NwK5dDvSG2EwcWbAhLKqTlSxFI1Bx9/AiWuXY3ci/Uwvg1A/eETDA ji4+qpISS3NnECTBcXJPkGx70jwh8H8t4dSwXcGMifQhwQP2aY4EYpgFnFwPxz/5W+VY +bVP26g+HO/93u+iRFxVcsjgn7czn1vXiGYu3TnSybuOZgyj7GWaJMWwDprMFo9hGKMw 8w7rosqt2sf7V0mPRHBLTNc5u6y4m57Rzs6OXpnC10QRLIaoBlvYdAkQf/pMG913i5iJ jpng== X-Gm-Message-State: AIVw111jUOWHqdQ0CuaWkl2+aKWT9EeR+evnLtbIZb58fr0OeknBYn1Y exGleP4jU+qqPGC4 X-Received: by 10.107.41.5 with SMTP id p5mr19893751iop.165.1501026516962; Tue, 25 Jul 2017 16:48:36 -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 m15sm5521463iti.9.2017.07.25.16.48.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Jul 2017 16:48:36 -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 v2 3/3] ASoC: codecs: msm8916-wcd-digital: select DMIC source in CIC filter path Date: Wed, 26 Jul 2017 01:48:22 +0200 Message-Id: <20170725234822.18763-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170725234822.18763-1-srinivas.kandagatla@linaro.org> References: <20170725234822.18763-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. Without this patch dmic is not functional. Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/msm8916-wcd-digital.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 2.9.3 diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index 825cc7d..f82a936 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c @@ -168,6 +168,9 @@ #define LPASS_CDC_TX2_VOL_CTL_CFG (0x2A8) #define LPASS_CDC_TX1_MUX_CTL (0x28C) +#define TX_MUX_CTL_ADC_DMIC_SEL_MASK BIT(0) +#define TX_MUX_CTL_ADC_DMIC_SEL_DMIC BIT(0) +#define TX_MUX_CTL_ADC_DMIC_SEL_ADC 0 #define TX_MUX_CTL_CUT_OFF_FREQ_MASK GENMASK(5, 4) #define TX_MUX_CTL_CUT_OFF_FREQ_SHIFT 4 #define TX_MUX_CTL_CF_NEG_3DB_4HZ (0x0 << 4) @@ -439,17 +442,37 @@ static int msm8916_wcd_digital_enable_dmic(struct snd_soc_dapm_widget *w, DMIC_B1_CTL_DMIC0_CLK_SEL_DIV3); switch (dmic) { case 1: + snd_soc_update_bits(codec, LPASS_CDC_TX1_MUX_CTL, + TX_MUX_CTL_ADC_DMIC_SEL_MASK, + TX_MUX_CTL_ADC_DMIC_SEL_DMIC); snd_soc_update_bits(codec, LPASS_CDC_TX1_DMIC_CTL, TXN_DMIC_CTL_CLK_SEL_MASK, TXN_DMIC_CTL_CLK_SEL_DIV3); break; case 2: + snd_soc_update_bits(codec, LPASS_CDC_TX2_MUX_CTL, + TX_MUX_CTL_ADC_DMIC_SEL_MASK, + TX_MUX_CTL_ADC_DMIC_SEL_DMIC); snd_soc_update_bits(codec, LPASS_CDC_TX2_DMIC_CTL, TXN_DMIC_CTL_CLK_SEL_MASK, TXN_DMIC_CTL_CLK_SEL_DIV3); break; } break; + case SND_SOC_DAPM_POST_PMD: + switch (dmic) { + case 1: + snd_soc_update_bits(codec, LPASS_CDC_TX1_MUX_CTL, + TX_MUX_CTL_ADC_DMIC_SEL_MASK, + 0); + break; + case 2: + snd_soc_update_bits(codec, LPASS_CDC_TX2_MUX_CTL, + TX_MUX_CTL_ADC_DMIC_SEL_MASK, + 0); + break; + } + break; } return 0; @@ -536,6 +559,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), };