From patchwork Mon Feb 12 22:03:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10214557 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 8890F60467 for ; Mon, 12 Feb 2018 22:03:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61BC725F3E for ; Mon, 12 Feb 2018 22:03:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5271B2879A; Mon, 12 Feb 2018 22:03:16 +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 91EBD25F3E for ; Mon, 12 Feb 2018 22:03:15 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4F25E2675DC; Mon, 12 Feb 2018 23:02:47 +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 9D6ED2675C4; Mon, 12 Feb 2018 23:02:43 +0100 (CET) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by alsa0.perex.cz (Postfix) with ESMTP id D2D5F2675B1 for ; Mon, 12 Feb 2018 23:02:41 +0100 (CET) Received: by mail-pl0-f68.google.com with SMTP id o11so2012148pls.2 for ; Mon, 12 Feb 2018 14:02:41 -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=EfVsO23RFRUbnV801VtQV0+zWtcMlNypgS6kih0lvVc=; b=atVPpPBxEy424qUl1KvB4oDQ9kSVmpWAAWfYAPtEIHKOJHhY0Bgkv5LsLOORNbpxFu l5fMLsImAE8MDGMRXYLLBYX/tSsWZxgaX0WSO6r9utHdlbQTL+IZpEnbgDGN1sKXSTfo WonxolV8JPhs3n5NDjRL5LP1j6c8TS3MAhMDIobPitIIoFIHosQZOumajGQdu0utGDma BdAlrXPP6m9BHKBQM9ObjJ8PP4pu+/No8aCTLBNMzp2jAtyeEkRjOEdxyY9mZbyje43r Y2YXa+gePampbjXB8e8uDdo2MGae7Il1Wifw+lV8UXOEoM4rwPS7op3/VhREE3AEJ3ST uG+A== 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=EfVsO23RFRUbnV801VtQV0+zWtcMlNypgS6kih0lvVc=; b=sXDl308pJzfsuGqLcu9jqgfCzxAV4bTuYg0ojT0zJsZeZRYyXeVYoMoixxwDcEsDDS 0dnJ9V+6xCJpIwtitdRl/as8yvGVTxVwNOIcpmYb0O1CKGcxgapDMArRb82oS2ZlOyIZ hhN4gWP7x5gnXkqZLworuvVDDbnFKBfHDhJ/WtBZbzs9bJidMtMKpSLKETvFWW12M/O5 IHvCBPNe2/Q+QLYiTBEpAT8p6fldKcNIC3Zz+qCoTe1vbvts1QjoNCmCUyveIojZSCI3 3eKhbYddz4DnVxcojupgd2DAhdKm91rfOlPTj1Z64MKC9szrFXu94wD8pVVZopF/uF2Y pzZg== X-Gm-Message-State: APf1xPDo0TASbM+DJOOfyIPdLsch18mC1iDb9Err/RKtAK4Jppm/DIPV 5r0ckvEHB5VmsBP83O0hfCw= X-Google-Smtp-Source: AH8x226GVUO5vPmiUDIxaYdBEBtg1d5FmucK8HZpIimtBS2y8BPr7Jeaia9mssITa7KlogvY/QvINA== X-Received: by 2002:a17:902:3225:: with SMTP id y34-v6mr11805861plb.399.1518472960506; Mon, 12 Feb 2018 14:02:40 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Feb 2018 14:02:39 -0800 (PST) From: Nicolin Chen To: broonie@kernel.org, timur@tabi.org Date: Mon, 12 Feb 2018 14:03:10 -0800 Message-Id: <1518473005-14090-3-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 02/17] ASoC: fsl_ssi: Keep ssi->i2s_net updated 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 The hw_params() overwrites i2s_net settings for special cases like mono-channel support, however, it doesn't update ssi->i2s_net as set_dai_fmt() does. This patch removes the local i2s_net variable and directly updates ssi->i2s_net in the hw_params() so that the driver can simply look up the ssi->i2s_net instead of reading the register. 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 3c8dd60..d4f1f0d 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -838,16 +838,16 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, } if (!fsl_ssi_is_ac97(ssi)) { - u8 i2s_net; /* Normal + Network mode to send 16-bit data in 32-bit frames */ if (fsl_ssi_is_i2s_cbm_cfs(ssi) && sample_size == 16) - i2s_net = SSI_SCR_I2S_MODE_NORMAL | SSI_SCR_NET; - else - i2s_net = ssi->i2s_net; + ssi->i2s_net = SSI_SCR_I2S_MODE_NORMAL | SSI_SCR_NET; + + /* Use Normal mode to send mono data at 1st slot of 2 slots */ + if (channels == 1) + ssi->i2s_net = SSI_SCR_I2S_MODE_NORMAL; regmap_update_bits(regs, REG_SSI_SCR, - SSI_SCR_I2S_NET_MASK, - channels == 1 ? 0 : i2s_net); + SSI_SCR_I2S_NET_MASK, ssi->i2s_net); } /* In synchronous mode, the SSI uses STCCR for capture */