From patchwork Mon Feb 12 22:03:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10214603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2E56C60467 for ; Mon, 12 Feb 2018 22:05:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AA2F26538 for ; Mon, 12 Feb 2018 22:05:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1971289B5; Mon, 12 Feb 2018 22:05:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44DEF26538 for ; Mon, 12 Feb 2018 22:05:01 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E8221267699; Mon, 12 Feb 2018 23:03:00 +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 E292C267696; Mon, 12 Feb 2018 23:02:59 +0100 (CET) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by alsa0.perex.cz (Postfix) with ESMTP id A61A426759B for ; Mon, 12 Feb 2018 23:02:51 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id g2so8413629pgn.7 for ; Mon, 12 Feb 2018 14:02:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BbC5ulZf1S0szPh7Vzw7LxnY1iy0LhlCIJm+ydtPP3k=; b=s9Hc8R5xgrZuqoiJYsiO8/4AJCZZgr3Ik7cNA06bICDWnuoQpilMUqthxCMhc4zxqn k16HPv5IIgPujADyjBG/LxMrz5Rd39l8cYIe01KOMpPV92Iu+X6bUQeUrb8CKdMCNn/2 /AkqA+8E68xu+94qjzmxUSsXV0jCv5cJUe7Xe7IVQNAv0rIYos5uCp0f5NktGmt1B2YI ErCubY06YoRJgrqBLPdmyAtdUoIKPzdIUZKeTXWuAJleZ2GvkVqw1US8n2OKBRV5uqVS 6902p+GP5oVHvfWGED09xsyUoiwR3zb/OTDp9lTtsD/EHdJudYHXRMDWqGB14/Up/lse vtqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BbC5ulZf1S0szPh7Vzw7LxnY1iy0LhlCIJm+ydtPP3k=; b=Z9HpEyPOa7QO0EAOU5XO2qyMav4ESsmFNaEs+lLJ7kFfR9dskRcNScWrbbt6TU6VD9 4qlwr/vnojxxMUsHD0KV9OJqorVe7v3r6PAhvWUcy8jUG0RPILHZnztN2bs3CfLn/11j 5ZPkQ001IGSLkYZx8bWBB0GOPCEmdPPsXxoQ6Gpdnd6ReHvQna2LXhIzI4ra7nf3ZBlo yJdpHrHACL/Ib8Mea4UGcqYlZZvsVeNq8cNzpIjOBjs0GGtRemMiIMNRBU3kAq/kOVp3 fBR/hMVB05BladCLaZ4muGE/hBIfewJOFj7AsnEM6OWcRIxEPDUqw5jyCmog/rS6rFHF g5pg== X-Gm-Message-State: APf1xPBUEpp9T0KzEG1pzE0Wgd7nawod6DhFiNoe3xHjdriaaHVdlYrq wur3ISwzn9eC/PXko/iRAdA= X-Google-Smtp-Source: AH8x2278Zeg73kKh/B9ogkT54fLb4MH7YfFb1mFxbApOaocu4k9AaDfODPXRNJA/cStRuOY8D+Jh1Q== X-Received: by 10.99.129.66 with SMTP id t63mr7037318pgd.376.1518472970575; Mon, 12 Feb 2018 14:02:50 -0800 (PST) Received: from Asurada-Nvidia.nvidia.com (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id c8sm13386159pgn.72.2018.02.12.14.02.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Feb 2018 14:02:50 -0800 (PST) From: Nicolin Chen To: broonie@kernel.org, timur@tabi.org Date: Mon, 12 Feb 2018 14:03:18 -0800 Message-Id: <1518473005-14090-11-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1518473005-14090-1-git-send-email-nicoleotsuka@gmail.com> References: <1518473005-14090-1-git-send-email-nicoleotsuka@gmail.com> Cc: mail@maciej.szmigiero.name, kernel@pengutronix.de, lgirdwood@gmail.com, alsa-devel@alsa-project.org, caleb@crome.org, linux-kernel@vger.kernel.org, arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] [PATCH v6 10/17] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together 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 X-Virus-Scanned: ClamAV using ClamSMTP 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 --- sound/soc/fsl/fsl_ssi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 156f5132..00dfdc7 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);