From patchwork Thu Feb 22 13:16:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129233 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp586098lja; Thu, 22 Feb 2018 05:17:28 -0800 (PST) X-Google-Smtp-Source: AH8x224wW0/njiEhVdd3nlWxFKJNXwaZPbV46NMcm/Y2tQb1IaqWNgwBIeLIzbgzcIkOrCa9Aie/ X-Received: by 10.223.175.230 with SMTP id y38mr6406962wrd.26.1519305448215; Thu, 22 Feb 2018 05:17:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305448; cv=none; d=google.com; s=arc-20160816; b=C8DsZM3VfLxVlqE/9xLuvAn2sLQoFGLAIVfsEqfQJHEWqQ3zFPJtJ3t/7JqZvJWhbG KRxg6adJ3SPDCW9GUtWaBAlDq/c/ihp97jN+aWMHAPPwsMjxxvKz6IKnbYMsZFlg9/OI LTysIjf85xxsIvPMo3h4VwMhC1LI6mcj3unditBrBOlbYbnjxl5DvPbD9WXmcjI/C+ub uYFUyO/d/hNNmo6CRDL1JqHVo7iGFQO2Ip0o+vvqpsQbmh/tTrDqXJl+1WyBx1JSf0EC xu7r08XvlHkqiTJHV+rP13VwRr+gAfl1dEiHzge2RHA/YLMcDZuzl8Uhw92xl2SFUVG1 nP/g== 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=DhkhNe+Bo9OD8pliU2Wp36usyQb6xPmoT5RTWEfEyGs=; b=lpP0x71cT5xBzgbVMP2I3liShSDAaxWNPgeuAouIxAbogwhZ/cEIHSIBGRyxnRq/8H M+G2fXQUzV1WUyYeQaddgwLAvi8fIXCE87rHPkvs8rVqG7OYFEGoQ1XeXSNrKMzKJipd HWSGM4NitMTGFDnThwrCix5fYlRwlfR6dvOm6VDwzraplcOY9gx1mY6+WNbQReJ0sIRa 0gwr3dcUr/HnnuNShPRHM9saun63kEDyLFzK67B0Zg8yU87+KP3pkY2vq8qvE/O/frcr cCmKWedXqVM1az9UEW4e5q/I4RGnHkFOXb5Aq+6WD02Y0KU+2lZaxekvd/n+V7tDCiWa V3lw== 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=l+fvXN+S; 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 l3si235996wml.155.2018.02.22.05.17.27; Thu, 22 Feb 2018 05:17:28 -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=l+fvXN+S; 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 E74BD26775D; Thu, 22 Feb 2018 14:16:43 +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 D3190267749; Thu, 22 Feb 2018 14:16:39 +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 C522626773E for ; Thu, 22 Feb 2018 14:16:32 +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=NDx3zT9UIn2eh6i7iKHGzzq0HsbwBw3lvVHkSDDWADE=; b=l+fvXN+SZenf vPoKi8SOPM9D/jl11IceVIvZ18jMV4N3tqsj/6WGFxnkDUsamKAX2vjOdMlML8Zy54K5nuuykn83x ZhDBiBbfapZKwgF1OMl2Z7IHfrBHO701qC86W/81XJlqG3hvlUubhDpTv5qThnOOhU3o24uPHsHSC U+TZk=; 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 1eoqjM-0002Sr-Hb; Thu, 22 Feb 2018 13:16:12 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqjM-0006C3-2a; Thu, 22 Feb 2018 13:16:12 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1515652995-15996-17-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:16:12 +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: Use ssi->streams instead of reading register" 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: Use ssi->streams instead of reading register 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 9c4f509a53cbcd968677c7f15c07260dd6c2276c Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:25 -0800 Subject: [PATCH] ASoC: fsl_ssi: Use ssi->streams instead of reading register Since ssi->streams is being updated along with SCR register and its SSIEN bit, it's simpler to use it instead. 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 | 7 +------ 1 file changed, 1 insertion(+), 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 5bc67ad8000f..0823b08923b5 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -803,11 +803,6 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, unsigned int sample_size = params_width(hw_params); u32 wl = SSI_SxCCR_WL(sample_size); int ret; - u32 scr; - int enabled; - - regmap_read(regs, REG_SSI_SCR, &scr); - enabled = scr & SSI_SCR_SSIEN; /* * SSI is properly configured if it is enabled and running in @@ -815,7 +810,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, * that should set separate configurations for STCCR and SRCCR * despite running in the synchronous mode. */ - if (enabled && ssi->synchronous) + if (ssi->streams && ssi->synchronous) return 0; if (fsl_ssi_is_i2s_master(ssi)) {