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: 872419 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zgKVj0m9Tz9s7f for ; Tue, 13 Feb 2018 09:05:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="atVPpPBx"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zgKVh5vQSzDqgJ for ; Tue, 13 Feb 2018 09:05:48 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="atVPpPBx"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c01::241; helo=mail-pl0-x241.google.com; envelope-from=nicoleotsuka@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="atVPpPBx"; dkim-atps=neutral Received: from mail-pl0-x241.google.com (mail-pl0-x241.google.com [IPv6:2607:f8b0:400e:c01::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zgKR635PFzF0pP for ; Tue, 13 Feb 2018 09:02:42 +1100 (AEDT) Received: by mail-pl0-x241.google.com with SMTP id m19so720733pls.5 for ; Mon, 12 Feb 2018 14:02:42 -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=tEmqN8EyZdQsljdG+5Pvco2kzkEqLvH++g8WPkd69RGIfFU1CpGx52H4NR9F6cqdJ+ NHvAOtSMWz9jJ4A+XGGS7XN4E4bJpyhVVGOet9+FTRm9ca8U4+9uCTK5b6NQ0PR6bop9 MofwSu3TWL3uvIMyk8rI+bMANW4uQHP6h2Qn8GILo5mKjLkC+DOW6taQ1GNLN49OR8xZ QCWXIC8v6bDcegShAqXDF19Y7VSEzNVBHDtUIg28iabUVUm1qbbIcp+Le+RDeHWDVKRh Prsh1wEyF96NtX2Fn3cTq3yO69B41eth4lj45yL8ltAs52RV4IL+rn9levAfTSgNRvV+ BGTw== X-Gm-Message-State: APf1xPBG3+CpxbL1SeSk/JrpGDXF+p1XdZS/2tOZd3jkXQbaBz5QVZ3l SOYmf/sH0ww1XANcTTq12oUX+Q== 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 Subject: [PATCH v6 02/17] ASoC: fsl_ssi: Keep ssi->i2s_net updated 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> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 */