From patchwork Fri Sep 13 19:28:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 173789 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp558689ilq; Fri, 13 Sep 2019 12:28:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7Rz3/ihAOlwMYVNI64kI9+rE1QxxFJBH7Vtq+oqiNYdOicj9FPWBzYxTh+sgdq/L4JSa9 X-Received: by 2002:a17:906:860d:: with SMTP id o13mr867264ejx.284.1568402897532; Fri, 13 Sep 2019 12:28:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568402897; cv=none; d=google.com; s=arc-20160816; b=B2VgsW63LgTBUndHVCz3kc+T2pEwmQLBMKsZCPY5QVcC0eSm/xBHntNGY+FiuQWVY5 UhDTXS7drBitX/oMEvllDLEqP/P4oRHa5gqXWbJbavkhFksG2sEVMeyCnggSh6fxh8UW lkcdfy1IkxGGDRdZE6q6sFr3JYvEuoaKOC+KvcADssJiQh0QbkihE5TEqdMtpNlmNirT KkDBP4JpdlBE/+zBc5nzTogj+dHFhQAi8iwl664cVWhQMSE65944mSBVQQUzGtj903Tl NCchlRmpjhu63X14fGydMu3wPKqn29nCon5KuHH6P6fzmUpMyeyep9uJvTyDeqfL4XDU WGgg== 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; bh=Jce4LvTz4NSAR129qqI8ufD1ObORqIhZ4kMoj3+4elE=; b=EQrlxs28pkXlpV4gT7Y9ei+Cb5x0mtCV8RV+38gIlSeFjnnHO4tsghw16sp8wxrK5T Dh7hPmtED+/Tg3FkhudgqgzFL5/uG2DL7X4IqIu1pY2eJ5B5KKvYrQuFEYR8EhOLDhhy mmm1bsChnGYdfMKyZZlWcvsJ4ee4QZh84V4nOxGYLj0DS+ANqoYpqfE5LIxQMYwpnsd9 1emWmnJnlw6tJIV9NpJvDhbYT/ihtN+Qy6qi10So2IrIJMdW1zEENCwMciZcrO787LlZ 2RNg4A38ayb2KHuQWyuGSyMQRq/vCwoiWKX1rVt9aEC9OoT5el09mvnqwGW8V3FuBqlT oMMw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b9si7812474edj.0.2019.09.13.12.28.17; Fri, 13 Sep 2019 12:28:17 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388030AbfIMT2P (ORCPT + 27 others); Fri, 13 Sep 2019 15:28:15 -0400 Received: from inva021.nxp.com ([92.121.34.21]:43364 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729652AbfIMT2N (ORCPT ); Fri, 13 Sep 2019 15:28:13 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id C655A200785; Fri, 13 Sep 2019 21:28:11 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id B9F6420076D; Fri, 13 Sep 2019 21:28:11 +0200 (CEST) Received: from fsr-ub1864-103.ea.freescale.net (fsr-ub1864-103.ea.freescale.net [10.171.82.17]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 3037E205DB; Fri, 13 Sep 2019 21:28:11 +0200 (CEST) From: Daniel Baluta To: broonie@kernel.org Cc: timur@kernel.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Shengjiu Wang , NXP Linux Team , Daniel Baluta Subject: [PATCH v2 2/3] ASoC: fsl_sai: Fix xMR setting in synchronous mode Date: Fri, 13 Sep 2019 22:28:06 +0300 Message-Id: <20190913192807.8423-3-daniel.baluta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190913192807.8423-1-daniel.baluta@nxp.com> References: <20190913192807.8423-1-daniel.baluta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shengjiu Wang When Tx is synchronous with receiver the RMR should not be changed. When Rx is synchronous with transmitter the TMR should not be changed. Cc: NXP Linux Team Signed-off-by: Shengjiu Wang Signed-off-by: Daniel Baluta --- Changes since v1: * new patch sound/soc/fsl/fsl_sai.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.17.1 diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index b517e4bc1b87..6598a1ae0a2d 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -482,8 +482,6 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(sai->regmap, FSL_SAI_TCR5(ofs), FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK | FSL_SAI_CR5_FBT_MASK, val_cr5); - regmap_write(sai->regmap, FSL_SAI_TMR, - ~0UL - ((1 << channels) - 1)); } else if (!sai->synchronous[RX] && sai->synchronous[TX] && tx) { regmap_update_bits(sai->regmap, FSL_SAI_RCR4(ofs), FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK, @@ -491,8 +489,6 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(sai->regmap, FSL_SAI_RCR5(ofs), FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK | FSL_SAI_CR5_FBT_MASK, val_cr5); - regmap_write(sai->regmap, FSL_SAI_RMR, - ~0UL - ((1 << channels) - 1)); } }