From patchwork Fri Nov 8 18:49:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 178948 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3148746ilf; Fri, 8 Nov 2019 11:13:34 -0800 (PST) X-Google-Smtp-Source: APXvYqzKa6MiaJbiQ9rmseFpBGquHObsIERE0zdV7l9hWpoNIj+TzNqGcOFfsti+gXnNyjIo9rP8 X-Received: by 2002:a50:baa9:: with SMTP id x38mr11465421ede.106.1573240414741; Fri, 08 Nov 2019 11:13:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573240414; cv=none; d=google.com; s=arc-20160816; b=vNbIRyVHEhXbBrPcsYq2c/r+E3SO8qn7gGjAhRylboUiBkZ1gwcXVF1NFYJIndbXNf r+kmvkV2YQyiNAvpGJ71QGM5mZOWKLffAIxPUHJwW8H5I1bC4GT9G5nVVQfFeNNOZkMO 4kjbPxCpxLbuIZXkktYm+sv7u0w2bRwLhtSjRCCxi1bUc1m45oaqHOuIVNj0VeT0ejjG KFA6oI97FjHUwidazpcT4xHd7fv/JD54q69wD6ZoWVaxaPLUzXOVpa4wv+R8j314U+aV LxfiO6avp2eJwhRj0MzbZxSlmF94hv9CDagtUFCuccPgzzf4gm3DGREBJJzkrrpp/Pqb cbXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UpZm/01jzmx0ONGp8tr22OQNfnfNwKwJhQK5i+IUKi4=; b=MboUTOlURr3nDtSNNfDQXYss6bY2XAT1wKx054WBJiE/g/+jMOWxiT2zc0cAVa9Zwy Z/LVS0eyy7aFpcoC4rCpOV5YXW9oUm0DRNbMAlrXs8ntLpVvW7HofqzpgXk3Y9pnIKF3 R0KvFF0llHDEUo7ciDYDVmXJKvKpBNrMVpplAjfNE09A5gnAB8Iook78fuRpW3Iem7BW LTocilOUAG+kEVKEhNRyC64v1M6uP2/iakEDmFBp6dxRN9VdI6NBSBF2wkO4cPCCypOD RJhUWqQ93eTE/s2gbDiowXX3c7cEmXLbXbH4WvR0BidjBtlP98rymdW8XZlwp+HxOg1s 8jRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HVZV1Y27; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si4352691eju.362.2019.11.08.11.13.34; Fri, 08 Nov 2019 11:13:34 -0800 (PST) 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=@kernel.org header.s=default header.b=HVZV1Y27; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390651AbfKHTN2 (ORCPT + 26 others); Fri, 8 Nov 2019 14:13:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:38348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391464AbfKHTHf (ORCPT ); Fri, 8 Nov 2019 14:07:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 74216206A3; Fri, 8 Nov 2019 19:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240055; bh=/idMyIy3EstznScmSyy4e32Pa8RU7vF8zAOKGKWH8Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HVZV1Y275l4bvTYNsMDjplCQpz8kJhuP4bt+6TR/JM/sKJudJFLSjl2BWvb89Gnem QBWJEuHYB/NnkH2EkJdvDDyjnUqKKSF0Dulj6RFaHGVH6YRFMz92Uyws+fyfjj2hTv C67eWsOgkyiCcJQRNvAh8bdAZ7Bla0KcfLaCbzlo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephan Gerhold , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 5.3 031/140] ASoC: msm8916-wcd-digital: add missing MIX2 path for RX1/2 Date: Fri, 8 Nov 2019 19:49:19 +0100 Message-Id: <20191108174906.056525827@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit bcab05880f9306e94531b0009c627421db110a74 ] This patch adds missing MIX2 path on RX1/2 which take IIR1 and IIR2 as inputs. Without this patch sound card fails to intialize with below warning: ASoC: no sink widget found for RX1 MIX2 INP1 ASoC: Failed to add route IIR1 -> IIR1 -> RX1 MIX2 INP1 ASoC: no sink widget found for RX2 MIX2 INP1 ASoC: Failed to add route IIR1 -> IIR1 -> RX2 MIX2 INP1 ASoC: no sink widget found for RX1 MIX2 INP1 ASoC: Failed to add route IIR2 -> IIR2 -> RX1 MIX2 INP1 ASoC: no sink widget found for RX2 MIX2 INP1 ASoC: Failed to add route IIR2 -> IIR2 -> RX2 MIX2 INP1 Reported-by: Stephan Gerhold Signed-off-by: Srinivas Kandagatla Tested-by: Stephan Gerhold Link: https://lore.kernel.org/r/20191009111944.28069-1-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/msm8916-wcd-digital.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.20.1 diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index 1db7e43ec203e..5963d170df432 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c @@ -243,6 +243,10 @@ static const char *const rx_mix1_text[] = { "ZERO", "IIR1", "IIR2", "RX1", "RX2", "RX3" }; +static const char * const rx_mix2_text[] = { + "ZERO", "IIR1", "IIR2" +}; + static const char *const dec_mux_text[] = { "ZERO", "ADC1", "ADC2", "ADC3", "DMIC1", "DMIC2" }; @@ -270,6 +274,16 @@ static const struct soc_enum rx3_mix1_inp_enum[] = { SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B2_CTL, 0, 6, rx_mix1_text), }; +/* RX1 MIX2 */ +static const struct soc_enum rx_mix2_inp1_chain_enum = + SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B3_CTL, + 0, 3, rx_mix2_text); + +/* RX2 MIX2 */ +static const struct soc_enum rx2_mix2_inp1_chain_enum = + SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B3_CTL, + 0, 3, rx_mix2_text); + /* DEC */ static const struct soc_enum dec1_mux_enum = SOC_ENUM_SINGLE( LPASS_CDC_CONN_TX_B1_CTL, 0, 6, dec_mux_text); @@ -309,6 +323,10 @@ static const struct snd_kcontrol_new rx3_mix1_inp2_mux = SOC_DAPM_ENUM( "RX3 MIX1 INP2 Mux", rx3_mix1_inp_enum[1]); static const struct snd_kcontrol_new rx3_mix1_inp3_mux = SOC_DAPM_ENUM( "RX3 MIX1 INP3 Mux", rx3_mix1_inp_enum[2]); +static const struct snd_kcontrol_new rx1_mix2_inp1_mux = SOC_DAPM_ENUM( + "RX1 MIX2 INP1 Mux", rx_mix2_inp1_chain_enum); +static const struct snd_kcontrol_new rx2_mix2_inp1_mux = SOC_DAPM_ENUM( + "RX2 MIX2 INP1 Mux", rx2_mix2_inp1_chain_enum); /* Digital Gain control -38.4 dB to +38.4 dB in 0.3 dB steps */ static const DECLARE_TLV_DB_SCALE(digital_gain, -3840, 30, 0); @@ -740,6 +758,10 @@ static const struct snd_soc_dapm_widget msm8916_wcd_digital_dapm_widgets[] = { &rx3_mix1_inp2_mux), SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0, &rx3_mix1_inp3_mux), + SND_SOC_DAPM_MUX("RX1 MIX2 INP1", SND_SOC_NOPM, 0, 0, + &rx1_mix2_inp1_mux), + SND_SOC_DAPM_MUX("RX2 MIX2 INP1", SND_SOC_NOPM, 0, 0, + &rx2_mix2_inp1_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), From patchwork Fri Nov 8 18:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 178943 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3141123ilf; Fri, 8 Nov 2019 11:07:51 -0800 (PST) X-Google-Smtp-Source: APXvYqxjuoLvuHUr6wApp6qGATaCpTzuwSPp82nir32eDkv1TLPoWqQ7v39EmB/7pJr1w3Dsfnw1 X-Received: by 2002:a17:906:4e99:: with SMTP id v25mr10462164eju.106.1573240071629; Fri, 08 Nov 2019 11:07:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573240071; cv=none; d=google.com; s=arc-20160816; b=xjRKd18IxVTF3EcxJAjI70LZHYm3coOf5gVVb7TbMR7kr4vzR6aR927kPhRYJHCPF4 cvO+U3cWHXC035CUmH5OJDuUHm5Biy71KI/u6BXPg3PiXii4IDkheFWY2y3kUU6OPChg hg+Oeav/53kdlrpz20XUSNOF08mI3ADlbJojGGTIybm415bXuzIs+5as4xqCYvaiHE9J I2oULpyDGLPqTvvNI6qB+QVq+eDcQ9HOSJ2j5Hspg90xDWNIGfTAGuall1tYAYFsU4ol AqHy97zRDY0Pi824tH2+m7mRYZCa7chvNhAz4AiuNfKdtdVTpSMTfwiqUJq5Wrktx2fE iShg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H1ZcaJ0vU4WLqDakv2TBSFJboT8r3JmY5gfeKdTY04w=; b=Q5dGLqA5DEoOFYgISuG8z8FMghLDA02y6dEs3cCZX9M+S8QPQBrSQDEX9ucPEPpum7 C6DFnN9fCqbtqqXWVH7vbjwgvXEZBKGxE/STkZCGL5EDWmreabCY6YxeleoNG/cwTXQH 5ZDmxb9Ri++hxWhGka1MfYkoKXQyTCJ2BHiNAIxNzYMhlMxkCCw0Nhb5tfCj6T6ZUCqH N5n4jZLQXCnHa4djYVaUk0AqGrHUlmlDzc0b4/AS1Kad5pKMy5SlUJYxtkkjkMX1KhkV TvsOESn085LX6TgRC5AZi6o0LMGz9AxKPo4yqP2AjcprstHDWRGEWFCUfVNKtPV2egoU ezAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Tcc3Wxj/"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r18si4679052edw.65.2019.11.08.11.07.51; Fri, 08 Nov 2019 11:07:51 -0800 (PST) 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=@kernel.org header.s=default header.b="Tcc3Wxj/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391472AbfKHTHl (ORCPT + 26 others); Fri, 8 Nov 2019 14:07:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:38416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390951AbfKHTHi (ORCPT ); Fri, 8 Nov 2019 14:07:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CE792196F; Fri, 8 Nov 2019 19:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240058; bh=+f5fV1K5SfaR6N41ceXQ6zF7T0/XN+l1jzOcTOiNBzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tcc3Wxj/8N8OPmshwW5hEujXctSpTLizCwfFrfJJMQ7BchLHjbmZ8+COwDQO2tsrA 0Y/8NVBu6/C311Ciu/ZX5n74MSyjztdKU2W9aaZ86Q7G5lWxam4aaD22O21XGDfBaj e4ey7PJ1TRa7m2g+6Giq7bRtGldekKGKuGBXWYfE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Baluta , Mark Brown , Sasha Levin Subject: [PATCH 5.3 032/140] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Date: Fri, 8 Nov 2019 19:49:20 +0100 Message-Id: <20191108174906.376128216@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Baluta [ Upstream commit af6219590b541418d3192e9bfa03989834ca0e78 ] asoc_simple_debug_info and asoc_simple_debug_dai must be static otherwise we might a compilation error if the compiler decides not to inline the given function. Fixes: 0580dde59438686d ("ASoC: simple-card-utils: add asoc_simple_debug_info()") Signed-off-by: Daniel Baluta Link: https://lore.kernel.org/r/20191009153615.32105-3-daniel.baluta@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- include/sound/simple_card_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 985a5f583de4c..31f76b6abf712 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -135,9 +135,9 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct link_info *li); #ifdef DEBUG -inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, - char *name, - struct asoc_simple_dai *dai) +static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, + char *name, + struct asoc_simple_dai *dai) { struct device *dev = simple_priv_to_dev(priv); @@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk)); } -inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) +static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) { struct snd_soc_card *card = simple_priv_to_card(priv); struct device *dev = simple_priv_to_dev(priv); From patchwork Fri Nov 8 18:49:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 178944 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3143062ilf; Fri, 8 Nov 2019 11:09:19 -0800 (PST) X-Google-Smtp-Source: APXvYqxw/yzrYB0Gk5Pp7rtNQxejCjrNJF+AQDFO72H44GHrsY7SvH2ayMm83gyDcWZq+/r02DDf X-Received: by 2002:a17:906:c797:: with SMTP id cw23mr10333879ejb.19.1573240003068; Fri, 08 Nov 2019 11:06:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573240003; cv=none; d=google.com; s=arc-20160816; b=eUVZQ/W/hmJn2PPGb40JYHyoSt9JtmM2akPGLNdlWhZhgbtfua0vdFNJIzUCzwG+Bq wVoBKZlHzFnsc/VD5QlR2g3fmufeLcnf1GhSl+FD/D27pkKAv40wddoMjiT6FXiTzoZq ZM2i5/4MSSGsnnVBDmJf5bBvuAZOGTOcRGahfrI/LvugB77uoCpHPaNP44uShQ9r31g5 F1INdlbj1kLPw2lA5diAQGM9Z6/Zbr83Fo4+SDSWHwFVL5Hh7dJVmFA831Nmyd3x5inZ gAhMvIuO/xje+1JHpyfVEvUE/igcCjg450rnUvND03Gk9HpFblgpX/DbynYqkMB1fTJX gMzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cxVe8F1rVUMEwhOoODltvX74+iLJIED5N5j0TqpSg2k=; b=ZvExIP7BdUAq7UqY/Gk4gAV/83vTsA5qzTP7sduxaVMyyU+Fze+EPTwSeUcOR9HQF/ pWzUL4CvFcYBSJQzTprsRVjkQfK/1/xYyIXPio0ZJmtMcThF6HtsMa5rva73JMzp9pdj B09q8YeU8LanHmwrIMtGKBGQhEF2Roc7cfQxZLDYP510W2/Nf2EQQgf2KVM0q/7enKiD czzhBrIAafTRWsogMLqYHv16rml4thDjiok1ev9kvvWR9QD1+03a2lMvjLbhBCf18q+c quLFC2qxM+t1v7t0jwuCLYrnzE0Jm7i6mVuyO+/loV0q1YA0OGyMjIuciT69ll8gEqzO Vrpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nr9bIr03; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d6si5974000edj.28.2019.11.08.11.06.42; Fri, 08 Nov 2019 11:06:43 -0800 (PST) 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=@kernel.org header.s=default header.b=nr9bIr03; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390709AbfKHTGk (ORCPT + 26 others); Fri, 8 Nov 2019 14:06:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:37148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390464AbfKHTGh (ORCPT ); Fri, 8 Nov 2019 14:06:37 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4602821D82; Fri, 8 Nov 2019 19:06:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239996; bh=MlSn6EG/sX4eezoHVRHjn2g4KK7MWQrmhKBVyLDiuts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nr9bIr03K9fvQktpIdf+pTxXu/y18Dku8XsZPc7I5AcraZYUtS2SXaCF5rR6eXsqI PochzwZ8yway0cQYsNGFuOSTyZ50UD6xLME0WilrJkpHU8OSxQPn66Plk5c7zp9bAG AkmFS8sCao3OrFcw0lfqJ9jMiIcwampgy7CAzqY8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Sekhar Nori , Sasha Levin Subject: [PATCH 5.3 053/140] ARM: davinci: dm365: Fix McBSP dma_slave_map entry Date: Fri, 8 Nov 2019 19:49:41 +0100 Message-Id: <20191108174908.686363166@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Ujfalusi [ Upstream commit 564b6bb9d42d31fc80c006658cf38940a9b99616 ] dm365 have only single McBSP, so the device name is without .0 Fixes: 0c750e1fe481d ("ARM: davinci: dm365: Add dma_slave_map to edma") Signed-off-by: Peter Ujfalusi Signed-off-by: Sekhar Nori Signed-off-by: Sasha Levin --- arch/arm/mach-davinci/dm365.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 2f9ae6431bf54..cebab6af31a2d 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -462,8 +462,8 @@ static s8 dm365_queue_priority_mapping[][2] = { }; static const struct dma_slave_map dm365_edma_map[] = { - { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 2) }, - { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 3) }, + { "davinci-mcbsp", "tx", EDMA_FILTER_PARAM(0, 2) }, + { "davinci-mcbsp", "rx", EDMA_FILTER_PARAM(0, 3) }, { "davinci_voicecodec", "tx", EDMA_FILTER_PARAM(0, 2) }, { "davinci_voicecodec", "rx", EDMA_FILTER_PARAM(0, 3) }, { "spi_davinci.2", "tx", EDMA_FILTER_PARAM(0, 10) }, From patchwork Fri Nov 8 18:51:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 178945 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3145201ilf; Fri, 8 Nov 2019 11:10:56 -0800 (PST) X-Google-Smtp-Source: APXvYqxkBnp3IWRFMIcuNbxGtq0TDlfCebhUf8QSSNMbxGb03uKG0XckeZOtJwE1CO4Wxb59B5zf X-Received: by 2002:aa7:c695:: with SMTP id n21mr12222058edq.204.1573240256025; Fri, 08 Nov 2019 11:10:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573240256; cv=none; d=google.com; s=arc-20160816; b=xkSi1LK8uwwna9sIQZkF7Fh/h1pYMwq+TJtkioa2WnbvWhqeGiFbhhs6SegvjcxorI Jl0lW1PrZoKJUw5/No6QIs5atTDdKARGw2yrqho801v9MxxhjLBz1EJmzxXbiRLwIW4v ZcqXh2WImIHAye9CKAd/quHFL70Cv5hhdlXzPQ3W5M1mFGfQAdLy3JHjzVcuyA9l6GPk Dhv/JLeRVR4s0mevgn0uxtwBjIlTJ0IFnILovb1BBygnH2sL/6yx/FAp4HUnx/pCEJFx IMtW1vyZXjmEKCMZDhby7gJinhHNRwH1psrxOrvqs7RGz4kNJV6BFN+rlXvhs75ddb4d EwMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9D0cVjXkPhJvWNczN+XEQ6YyNJxubo8N/DAwja2SH8I=; b=WD+R01RELm6TsK7C3Sqx32AEfpaYVChnWAIc9fj8ghKZx8B6s5YLDZbHrocvmB9DOB Voeynn3DQv0xyusoFkLBdbCK4j7UTdPIz3uzeAyYTkFRG1JZ33HBw8ORR6G/jD1Fs2yY 50UFQtajmhgUI49GGVuA9fiM6OsxkTFhfuOEkBOyePybCBCOfCzzc40b/rljSBArD5P2 NEUJ6r3oOQkokYWPGJNFPcAHEqAJDILsiLOaRJi2zSOiesfUHHqftvUcDY9tmLhJPUUP EVPjfGQVL7XuVpxMKIZ9UOOliOvgxLLymXGZHaLr+FxnJjEtSm18iD2bK4Jcu6Hx14z/ 2nCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EX2SpfqV; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w29si4908786edd.270.2019.11.08.11.10.55; Fri, 08 Nov 2019 11:10:56 -0800 (PST) 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=@kernel.org header.s=default header.b=EX2SpfqV; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391885AbfKHTKq (ORCPT + 26 others); Fri, 8 Nov 2019 14:10:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:43044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388212AbfKHTKo (ORCPT ); Fri, 8 Nov 2019 14:10:44 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB2992087E; Fri, 8 Nov 2019 19:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240244; bh=3oqN9qWgbnEMey6o548/1M+XQR4qFTVWwAbeghvBoXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EX2SpfqVQjSaZ9M0QsnTnp1GLniYNLdlANuZKhQw4iQrdBpsoNJPJxTRudVC5/64P IsULw60ULPGfBczDb03eeprUQjBCIthZC0Ok/uwwoagUkV/hdPi0RXNtOnLM0Shq61 K4HjODSqJFMt46//imzkNIUeN2h4lZh40S/oY33o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Mark Brown , Mathieu Poirier Subject: [PATCH 5.3 138/140] ASoC: pcm3168a: The codec does not support S32_LE Date: Fri, 8 Nov 2019 19:51:06 +0100 Message-Id: <20191108174913.261851974@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Ujfalusi commit 7b2db65b59c30d58c129d3c8b2101feca686155a upstream. 24 bits is supported in all modes and 16 bit only when the codec is slave and the DAI is set to RIGHT_J. Remove the unsupported sample format. Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20190919071652.31724-1-peter.ujfalusi@ti.com Signed-off-by: Mark Brown Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/pcm3168a.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -21,8 +21,7 @@ #define PCM3168A_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S24_3LE | \ - SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S32_LE) + SNDRV_PCM_FMTBIT_S24_LE) #define PCM3168A_FMT_I2S 0x0 #define PCM3168A_FMT_LEFT_J 0x1