From patchwork Thu Feb 22 13:17:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129245 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp588482lja; Thu, 22 Feb 2018 05:19:51 -0800 (PST) X-Google-Smtp-Source: AH8x225TYg0pmZnc8rHk5Q9n4vYTkbOMNsUHu+t4Qtt/zwjWjKgKM5PQXq1+/E4GWMHr0xVygGmH X-Received: by 10.223.179.194 with SMTP id x2mr6649202wrd.94.1519305591842; Thu, 22 Feb 2018 05:19:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305591; cv=none; d=google.com; s=arc-20160816; b=nMQxFrRs5Skb7Ng0O1mmQwk8TAOsgtjoYENv9SqzAF6SC9bQiCpiZUETy+wtIyfeLu lUa79maA4LnItAJqPI50Jf5gVO4i0aBvEGDKUfWEZl3/R+C+ROU6zGh/3niOUVxiyJt6 BXSWem4mqPtS+WFrU8g8S4daA3wVWl19eJVu6uyFV48I/CFkCsncGLo5ZRJON/ALuPe+ ui/QcgnaPEkSHDbjq+PgKQ2w5AZKM63JvuIAUgpauQ92ohWGvfNhNt6fj4O3YT+tnVqk ZzGLErFHPjPa10J9j8/7JhJ+vqS5TZ9+loyoERpdkdvH33TJnpPF2gAGo/Cgln2MRnnw tC7g== 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=PrTaxsZMZmFsDr7Xbm8BKWc8ZLsxOFpwKlpT4H/ediQ=; b=p78UiZ7bzeXaV5Pe9MGJKkbyrk38XkwpZaok9ADJ4JnOCUsQNTq4uBdyXuhCeKMkv1 r4Lersyj/uDvC+Mb9NvMPTcJWdujG3Qr7lLh27eN/6dEsnzfi+HNo5O8rOQmNfoauo2K QWmFLCU7vxhVqBzpV8tTl75xJFD/gEZQoXIpTXBd0OFyFQR5CHVUZ/l1TG9suCKzXhe5 JW9VVOZrl20aXJlnSKqrppEzem+V1Kv1Py3jSGUf++QnLfo1kr8NzOq8459vFCpoC3rL SmzP5rDkx21Mlo8GOg5AwjCyl+zmFHVb2ePqlaaixUEiBgr3YD5INUfvlmzIivrbhD4j 44sw== 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=sIli9gCg; 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 7si63812wrp.56.2018.02.22.05.19.51; Thu, 22 Feb 2018 05:19:51 -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=sIli9gCg; 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 75F3F26788E; Thu, 22 Feb 2018 14:18: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 A125726787E; Thu, 22 Feb 2018 14:18: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 66E4F2677DD for ; Thu, 22 Feb 2018 14:17:20 +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=jlpTo/eY6uXSmQbgix5BGuwY8QCh+ke2GaOgrt0Xz0w=; b=sIli9gCg793k 9vzsqf/549RQHFasGNjmeLpDm8tO1vo6V1YwLhXXt3U8+Hd/pNih8z98eqKc6cS5nFGR+mSVNRc// HnQtm0J3ZolWfhWazCxmRJXrPRAYD+XspDYldiSNcVct5CnbYhinIwlMAB8SltSKOCV5mHLotuyCl WbB4A=; 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 1eoqkJ-0002WK-1w; Thu, 22 Feb 2018 13:17:11 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqkI-0006TJ-Ih; Thu, 22 Feb 2018 13:17:10 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1515652995-15996-2-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:17:10 +0000 Cc: alsa-devel@alsa-project.org, arnaud.mouiche@invoxia.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, mail@maciej.szmigiero.name, caleb@crome.org, timur@tabi.org, 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: Keep ssi->i2s_net updated" 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: Keep ssi->i2s_net updated 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 ebf08ae3bc906fc5dd33d02977efa5d4b9831517 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:10 -0800 Subject: [PATCH] ASoC: fsl_ssi: Keep ssi->i2s_net updated 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 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 3c8dd609e42e..d4f1f0d64136 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 */