From patchwork Thu Feb 22 13:16:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129237 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp586937lja; Thu, 22 Feb 2018 05:18:20 -0800 (PST) X-Google-Smtp-Source: AH8x224rMR006BYYVZQeturHBydrU6IFCMw74bXAJfx97HqIyxOLXNzLjHAlVlEkS3kxMWAVYBSI X-Received: by 10.223.136.164 with SMTP id f33mr6296458wrf.77.1519305500040; Thu, 22 Feb 2018 05:18:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305499; cv=none; d=google.com; s=arc-20160816; b=H2L8sPT8fER4ucjL1UOmE6LGXAhjaEjHDxAkiQJcmAbAHVlellHNoZTMB60Rf1yJaL fFSRo+Ps+sBBG7rcVzfCNo+YY7S6BWO7wIf9BeZwKcE2J56990LY3IKKx2bdc4uBzYDj DWbqVXUDEizQkwm3aO6XTyfPOvpWpgwTSOOI6CN+cIbj2lul5OC/qMI9lV7XV9cp6eOb 2ZPASK7PBWRT8xohId0ww8cdzusZQydXXfD8m44XRTQHMIc7ECZRuS4xTIk/sVCKgX2u Y1Oflq6EF5IY7Pn82l7AEeeLgOUcuJDOQo0oPIOPHw6gIJtr0aUMYDn5VFUdQXrxr42U fhLg== 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=gvy87iZpsu/KVFMlovbFNbs7Pqk06I3qDczItwxHL7E=; b=LF1mZPCpzykGb5lPKtInJdVWL7/47MxUmNPM2UnzRsFwJ7W8mz3TZynMUurwup1J9z i8ci09UMZ2uxVpU5KXK989DHlydR7S+/yV09Sol3VHiuVIjG3T9nr2I3xYihacGyITyW 5j27b03e3BKGytcUgH8zQjGJvsbXSS2J+5us3RZ1VknkGCogloai5oz4nTiVySDjt9zu XHZFgPBi0cIqqeSu1HNPGDDK2T/9UvousBUQFcF/NcTCuxQwaBmmnO4sIVgd3c26IQ55 DP7WHA464/Zhfj0DbfD/etRfeaaMDu0mu8cajJF1cbeARKLaQ4avB7jO3sH4+DW2ZKdn wxiw== 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=lZqn0J56; 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 r9si40746wrr.538.2018.02.22.05.18.19; Thu, 22 Feb 2018 05:18:19 -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=lZqn0J56; 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 66A1926777A; Thu, 22 Feb 2018 14:17:13 +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 EEDAF2677B3; Thu, 22 Feb 2018 14:17:10 +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 8057F267748 for ; Thu, 22 Feb 2018 14:16:51 +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=hLyazsyPjZL3nJ8hWUf9ZmBz+x9Oxc+HNs9rxpgDd6Q=; b=lZqn0J56foOU BDwxW7qm15w8MbwHvUv70bp44CyceDAS+7m4NPgtkomed4nictgHQicAqbB7GyH5x7YhrSLQsYjdF b2wmK4xroX3pdhbwTMVeOv2jNMlUh2DHEGaYp4wtdNMyxb/tVUJF2YUbEbgDn63xb5GLlvvN6JnOV B59Cc=; 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 1eoqjl-0002UN-6B; Thu, 22 Feb 2018 13:16:37 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqjk-0006Jt-MP; Thu, 22 Feb 2018 13:16:36 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1513702819-42310-9-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:16:36 +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: Set xFEN0 and xFEN1 together" 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: Set xFEN0 and xFEN1 together 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 702d7965e402a8dcd88e964fd5bba6f5f159d625 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:18 -0800 Subject: [PATCH] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together It'd be safer to enable both FIFOs for TX or RX at the same time. 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 156f5132feba..00dfdc77b567 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -591,6 +591,11 @@ static void fsl_ssi_setup_regvals(struct fsl_ssi *ssi) if (fsl_ssi_is_ac97(ssi)) vals[RX].scr = vals[TX].scr = 0; + if (ssi->use_dual_fifo) { + vals[RX].srcr |= SSI_SRCR_RFEN1; + vals[TX].stcr |= SSI_STCR_TFEN1; + } + if (ssi->use_dma) { vals[RX].sier |= SSI_SIER_RDMAE; vals[TX].sier |= SSI_SIER_TDMAE; @@ -991,14 +996,9 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, SSI_SFCSR_TFWM0(wm) | SSI_SFCSR_RFWM0(wm) | SSI_SFCSR_TFWM1(wm) | SSI_SFCSR_RFWM1(wm)); - if (ssi->use_dual_fifo) { - regmap_update_bits(regs, REG_SSI_SRCR, - SSI_SRCR_RFEN1, SSI_SRCR_RFEN1); - regmap_update_bits(regs, REG_SSI_STCR, - SSI_STCR_TFEN1, SSI_STCR_TFEN1); + if (ssi->use_dual_fifo) regmap_update_bits(regs, REG_SSI_SCR, SSI_SCR_TCH_EN, SSI_SCR_TCH_EN); - } if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_AC97) fsl_ssi_setup_ac97(ssi);