From patchwork Thu Feb 22 13:17:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129244 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp588309lja; Thu, 22 Feb 2018 05:19:40 -0800 (PST) X-Google-Smtp-Source: AH8x22650X0NtDagNHhObPhimUuKmphIiDikxGzj09RBJX943b3s3oDsUd5Mj3AHT7ajoXzDHvbC X-Received: by 10.28.7.206 with SMTP id 197mr5252126wmh.54.1519305580661; Thu, 22 Feb 2018 05:19:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305580; cv=none; d=google.com; s=arc-20160816; b=CnAZq4vMc9vukoG4/VOdIUPEtvNLP7jcSEAYxoXeIo55Jwx3vns1XZ0tYZ3EcOse7H wTONYbjR3iUwRbHejNYIW9Xdx6J6qx4Z2zPiC4NL/5sTVDCIGfsUn20S4NXDY2N/D8Z6 izYXAmUj6Z8s1WAPRoixC8L7/Hn9JQwAb/dtURfQRpLXiNZm31/H75dM49Mj1MTlM/Ey rl1gLsBUJagBo+QUEvzns9dLfmo3z+iVOZG7YtlM/VeRjz62P3Pgj/omF6z5Qd1HfinL 40MpQwe2MMqfWpg2FbykqDdH+1evv5Fjcik3rfp0Q74alY5nXQarvC1aznTBaJUSR872 UcxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=a1wQtKl7yyFcgFfLT+KRvWHPWYqdJv4gcSu59Tc0SfY=; b=sX+R1Pk71Qofh8R9ARQo5Rz7XxrSNrjtNA6ft83PN8hXzQDS8VYfXCK1mJkjkksgJG GePY37Wockp6iMU/Psbal5mS6ldmPTdW84NxzxXmxQPU5n0GV2HQz5KJrsjArHW28L3A 5s8iPBmtzyI74s3zW7ieo61xWzFfrG0saVwkdrqQttCQQjnYlDLCFzp/KBKif0Q2aS73 WZrvObW9koU4MtiDW5ntE+uYMnJyd4aCaRjBbebuE9h9RbaYdkWSZddKvi2/7GxgFyPe RD5HkhV7WJiXPdFSmckmZbf4JGx44Fl71fFfsrk08wYWfNuYICaklHMJ34WOVrG/Jy7L SnXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=Eyou87tS; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id l126si253304wml.1.2018.02.22.05.19.40; Thu, 22 Feb 2018 05:19:40 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=Eyou87tS; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CDEA72677DD; Thu, 22 Feb 2018 14:18:15 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4648E26787A; Thu, 22 Feb 2018 14:18:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id F22432677D8 for ; Thu, 22 Feb 2018 14:17:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=M+mWF2mtrcGmpbjlNRG86HHq4q20AtMGCWlBMONbIM8=; b=Eyou87tSwyel yBaM7fALv2+xFxK44Li9oBCsAszpZUYjRR3mzaS+xVIqy9Vs4xBVyXF4KY8IxFGdDF0rxeNJhJM6V Nem0nfbeiF5m/vXuWMQJiDBbhBs7wGiRD7WTa4c1immbuiC2RJU9yFTFGaPVldtxYNpvp0byESyVj N20OI=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eoqkE-0002W7-QV; Thu, 22 Feb 2018 13:17:06 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqkE-0006S8-AE; Thu, 22 Feb 2018 13:17:06 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1513702819-42310-2-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:17:06 +0000 Cc: mail@maciej.szmigiero.name, arnaud.mouiche@invoxia.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, timur@tabi.org, caleb@crome.org, lgirdwood@gmail.com, broonie@kernel.org, kernel@pengutronix.de, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] Applied "ASoC: fsl_ssi: Clean up set_dai_tdm_slot()" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: fsl_ssi: Clean up set_dai_tdm_slot() has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 09947634829ccc5568a80ac02c3395a8b77276c1 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:11 -0800 Subject: [PATCH] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() This patch replaces the register read with ssi->i2s_net for simplification. It also removes masking SSIEN from scr value since it's handled later by regmap_update_bits() to set this scr value back. Signed-off-by: Nicolin Chen Tested-by: Caleb Crome Tested-by: Maciej S. Szmigiero Reviewed-by: Maciej S. Szmigiero Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_ssi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index d4f1f0d64136..14046c32dc07 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1055,9 +1055,7 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, } /* The slot number should be >= 2 if using Network mode or I2S mode */ - regmap_read(regs, REG_SSI_SCR, &val); - val &= SSI_SCR_I2S_MODE_MASK | SSI_SCR_NET; - if (val && slots < 2) { + if (ssi->i2s_net && slots < 2) { dev_err(dai->dev, "slot number should be >= 2 in I2S or NET\n"); return -EINVAL; } @@ -1067,9 +1065,8 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, regmap_update_bits(regs, REG_SSI_SRCCR, SSI_SxCCR_DC_MASK, SSI_SxCCR_DC(slots)); - /* Save SSIEN bit of the SCR register */ + /* Save the SCR register value */ regmap_read(regs, REG_SSI_SCR, &val); - val &= SSI_SCR_SSIEN; /* Temporarily enable SSI to allow SxMSKs to be configurable */ regmap_update_bits(regs, REG_SSI_SCR, SSI_SCR_SSIEN, SSI_SCR_SSIEN);