From patchwork Mon Jul 17 13:54:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 107961 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp4594640obm; Mon, 17 Jul 2017 06:54:56 -0700 (PDT) X-Received: by 10.98.76.145 with SMTP id e17mr19238755pfj.78.1500299696352; Mon, 17 Jul 2017 06:54:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500299696; cv=none; d=google.com; s=arc-20160816; b=KeTwZ2ObTnIO+RsGq3PbaTL9l151XTwQPnahzwTyD1I58ZHuv6rraBhAjgwk0OVSUD zRdIDslLo9BQpnmKjP9md7rY1KgzchMJ7S4hSLShHrsgFH7/o+P+iJDQgTdymcYg9dvG GVrU53y1jOXIGUBMRDTUoDi60H/0qFdqiu2MIMOQBF6xqJzEYi60Y1qBQTTraJEgprKq iCWIDj9LUI+t18mTN7WBYRSah+1Vjd8QeVxmqh2EOULsOlCG2sapLZKBRxSX3/CM8GVc ghOiQCSR/tI5mTB2/m8y63LE4Ej/XK/IgOlz6sgRquJ2uTb80cRAlge/US27oi7p7CM+ vViw== 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=e7sCsayXZozxMb18/kCm23DklQtfgyFc0n4U07Em41c=; b=EnvzQ+iUZSHorFrBMHFMl9oUndyw+toWcJuxi4/M7Q4omQTA5hkyC8YXCTxP5+yNRB KlthSeg7ASZFhq4ZdyrTY5fJIJP9amGKn6gCH3WWnjhwqSCVuVddJc0qixA82KEzAoRX KhZI+01qOqHUNKAsX7vYGtLm2IinxxZaXcth2KtyydVq/sfE27JUy3KU1rCfhaoMzkJ1 Gh/CFT3F9VwQ+ouu2zVd4FTDmtV3czNc5Kb1RqWTjb3xCzNllIwNB/VN0sFrJ6ZgSh5o yp31rE2+PTpm/vqmfOM3rmGzg2d6CHMMvcAXk1j7m8/zhKQ7JzH4G7ibUIWBOdm2Qeq2 dDSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=Nzwvb7dN; 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 g3si13240563plk.571.2017.07.17.06.54.55; Mon, 17 Jul 2017 06:54: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=Nzwvb7dN; 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 S1751403AbdGQNyx (ORCPT + 25 others); Mon, 17 Jul 2017 09:54:53 -0400 Received: from mail-it0-f41.google.com ([209.85.214.41]:37328 "EHLO mail-it0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751286AbdGQNyg (ORCPT ); Mon, 17 Jul 2017 09:54:36 -0400 Received: by mail-it0-f41.google.com with SMTP id m84so52167532ita.0 for ; Mon, 17 Jul 2017 06:54: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=e7sCsayXZozxMb18/kCm23DklQtfgyFc0n4U07Em41c=; b=Nzwvb7dN943AV1xGZX0kxNFwiM/DAga1PZ7oZpQ1eIwlMKQ7YUtPenNliB5m4HGhAo 5II94w9X0201HECUBY+PsUUhy/bIPTsluz1XhUtcXLh7+XLL5+r8F5Ijxq9NvsqKFRHT OlidOEE/hiJuh+q4bWGfWJErhH3THEJS5vpCA= 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=e7sCsayXZozxMb18/kCm23DklQtfgyFc0n4U07Em41c=; b=dta2tt8ZRkGjt/s2KZnNcwl/lH5ClfvV8it+/NtfMTyXm/Ahq5gHnGOss+Mlkkb3Vr wXc4WANfYg/AgRUHXgvzqBo/8Z6aT3+v22kVRYY1JPQ3D7a0O07K7U9rnWFpZP9xxwkR 6ce/wL9iuncLAWp+yKJoQ4VsV95SKDFMhbTvxy6/U41NO5E3gHZtBtIAci2QBDsv4tMQ nNLqqf9l7THvOGBpBmdSqhvOotH1A10oqpr0f92wkdeVM0i7abssTFKCdcGdjDvVKgR2 7OccWK0U+Mr3iWEzDCK/OCVc8Ufa/MCQMkgHR6ittKxwxaty1AHZ+jYKztwv5os10Jna Ltlw== X-Gm-Message-State: AIVw112LDGVQZSLBNlkZh31YWZe2EiXP6Q2OUJuSm0v1DdphR8f1vN7M MfVJeXpsIJAr7MQ7 X-Received: by 10.36.106.5 with SMTP id l5mr5404178itc.95.1500299675482; Mon, 17 Jul 2017 06:54: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 138sm5880561itw.10.2017.07.17.06.54.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jul 2017 06:54: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 3/3] ASoC: codecs: msm8916-wcd-digital: fix dmic support Date: Mon, 17 Jul 2017 15:54:10 +0200 Message-Id: <20170717135410.26812-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170717135410.26812-1-srinivas.kandagatla@linaro.org> References: <20170717135410.26812-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 dmic support which was broken in this driver. Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/msm8916-wcd-digital.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 2.11.0 diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index 126a0ee8aded..3265bd404fd7 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), };