From patchwork Thu Feb 22 13:16:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129238 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp587074lja; Thu, 22 Feb 2018 05:18:29 -0800 (PST) X-Google-Smtp-Source: AH8x2266r1W3vpOnV4FRrR2rPbkNTVv0b//3DhP4MI77mRjRRjU/d9UP0o64BxJlirFFBehQ/xrz X-Received: by 10.223.209.11 with SMTP id a11mr6564758wri.122.1519305509447; Thu, 22 Feb 2018 05:18:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305509; cv=none; d=google.com; s=arc-20160816; b=KVrb/7M8VuBp2HXXKLCjaNxle+bGciU3SdTLmyObyIOK7KSOlUdiXQamNZ78pMPjHc fe/K2phXS07mF+QeEC6N3NJRVFMtCQIFsvoo6wCP25cbFr+gcIhGrT2Cyd/v612cuMP1 ZdWJajk6W9w5d4j0mz16k5LLZRNvfot5GnX/vac5lo9Rvvn8SksP1iyR0vEUgvNzzWIB kL6JuyqqlMh9JLFxrDCZyZEaVsSxAkC84E3z+g/dGZLjadSmOsoWgpRNwUPF2BVZneqK 3bM5nFXRuZfNen4Y40o0l0WaIfrvjbNK7ch+XwcTaqita2LujWBFGbn9kBhuybMvVrok 9zhw== 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=E8zX/sIi+i0NaRuxGEGZGDcfqnvJ03RAxKRL5phk+/o=; b=PYfUbU3WmB54g2BRIcRQQR9lnHCLAqMf7lXj0xpMAyvny0KiYjauRJt32qtohxum2N gf5JS72e5NyoUIu6+Kva+WPqjOsy0ZzSq76LfkHZwckYY0MFjsEEyMVOSpWgGa799Y0h YuSaXVbOwwhmZ+ETui4frIRG12+u+l7HQdzxe2Knx9BSobJYBTIjlolg2klx38WAMuUh mSxW9Zu0nd2eXxYGY7dzin7O1xz5QINIC2GOrh1fVTXNv827jpflAba35hAr/PKBGtoG oCo8cXVg3Ge2NYFiHUYlEhkeRdtsQrjuSCxpGMF0q588w0QNz7CVAq7XYnGxqI5ue2wh /wew== 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=hXIuNcN7; 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 y62si236384wmd.96.2018.02.22.05.18.29; Thu, 22 Feb 2018 05:18:29 -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=hXIuNcN7; 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 BFD542677C4; Thu, 22 Feb 2018 14:17:17 +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 EB9262677C1; Thu, 22 Feb 2018 14:17:15 +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 18E5226778A for ; Thu, 22 Feb 2018 14:16:53 +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=zaJ5vpBUTVjADiJgenRX0yJ1SsxOMJW2ExQ3ySMF4DE=; b=hXIuNcN763VM MSGRIarvQtaMdRG/v8no9MvOe/65OZpwPO3w4+nq5SFJ3Igrx1V36UDI/VRtms6Af9h8zVy/uwmMr Zpwdlgs6vrnvt6YOS6047IZ3HF/eTO39TcL398SAEEWtZLiS8LGqiFVo5ntJ2rQ8b8aNzpuZg2sMr ICFN4=; 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 1eoqjo-0002Ub-CN; Thu, 22 Feb 2018 13:16:40 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqjn-0006L5-S6; Thu, 22 Feb 2018 13:16:39 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1513702819-42310-8-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:16:39 +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 fsl_ssi_setup_regvals()" 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 fsl_ssi_setup_regvals() 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 501bc1d70cf5ba8ccd9775ce987c90485034464e Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:17 -0800 Subject: [PATCH] ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals() This patch cleans fsl_ssi_setup_regvals() by following changes: 1) Moving DBG bits to the first lines. 2) Setting SSIE, RE/TE as default and cleaning it for AC97 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 | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 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 fc5768d243d1..156f5132feba 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -580,18 +580,16 @@ static void fsl_ssi_setup_regvals(struct fsl_ssi *ssi) { struct fsl_ssi_regvals *vals = ssi->regvals; - vals[RX].sier = SSI_SIER_RFF0_EN; + vals[RX].sier = SSI_SIER_RFF0_EN | FSLSSI_SIER_DBG_RX_FLAGS; vals[RX].srcr = SSI_SRCR_RFEN0; - vals[RX].scr = 0; - vals[TX].sier = SSI_SIER_TFE0_EN; + vals[RX].scr = SSI_SCR_SSIEN | SSI_SCR_RE; + vals[TX].sier = SSI_SIER_TFE0_EN | FSLSSI_SIER_DBG_TX_FLAGS; vals[TX].stcr = SSI_STCR_TFEN0; - vals[TX].scr = 0; + vals[TX].scr = SSI_SCR_SSIEN | SSI_SCR_TE; /* AC97 has already enabled SSIEN, RE and TE, so ignore them */ - if (!fsl_ssi_is_ac97(ssi)) { - vals[RX].scr = SSI_SCR_SSIEN | SSI_SCR_RE; - vals[TX].scr = SSI_SCR_SSIEN | SSI_SCR_TE; - } + if (fsl_ssi_is_ac97(ssi)) + vals[RX].scr = vals[TX].scr = 0; if (ssi->use_dma) { vals[RX].sier |= SSI_SIER_RDMAE; @@ -600,9 +598,6 @@ static void fsl_ssi_setup_regvals(struct fsl_ssi *ssi) vals[RX].sier |= SSI_SIER_RIE; vals[TX].sier |= SSI_SIER_TIE; } - - vals[RX].sier |= FSLSSI_SIER_DBG_RX_FLAGS; - vals[TX].sier |= FSLSSI_SIER_DBG_TX_FLAGS; } static void fsl_ssi_setup_ac97(struct fsl_ssi *ssi)