From patchwork Wed Nov 29 10:57:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 119952 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp4224660edl; Wed, 29 Nov 2017 02:59:04 -0800 (PST) X-Google-Smtp-Source: AGs4zMaR36aiHFwgnlqfPpTDSBDcutkPRkOIhcD0O0fhbwaFyNceLdHadQ/taEFy+zgNuYrp0U31 X-Received: by 10.28.60.8 with SMTP id j8mr2010768wma.136.1511953144905; Wed, 29 Nov 2017 02:59:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511953144; cv=none; d=google.com; s=arc-20160816; b=W6OiD4XLAi7VOS+yt78P0I81rfvKiWqDviscdyVVdYwVwtpWwanKoRTFvhNSAeGRDI 3dp2j8+iB2uT4j9Zu5H8IgBeO6CDtUTTHptkVwx8x5s9eQuLOohVyGCNubH+s5ZUzdSv +i3DS5BPRXeGA5799sbxxc2pmbzED2b2K0+XYZdtpKGgT39bdzY0bzCrKtUKSCm8IFtu 1advbdXGT9hzKu/kwKuAHiwdl+KM/+Jg0PL1ievCWs+4UALELF/EJ8CxFrLCBxK9u8lb uuE7XIH2zCd2ru3BBMoLkzEujIf0+PKXGjNM1fX3aJ7Vouts17tCbUU+ZiHKVi6/1G76 x8Mw== 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=1az8GG9Qr6ByKndf8tTRDRPF1Waqi8FSkX28+wQJiiY=; b=lSbSw57oe7Lhj1J2D5grOcMF+s+mvlB9w4Y9JndNcxl/UUxohNPV4A852mTn2nuLQw ssUCiqVG/WRD5YWgthv5iRpluwfNTXr+xU0/TndXbCfC/C2oi3zPlZk/9xLH+wrHuFi4 TzRcob80OQYApBnqmeVzwfjyVc6KaWAE4MKVqAWfyGhLaSg60nQjhqiycB9BpRpKkxMO kOls5aqIG4GOpCNfsHhj6V5j03x+dkHEadM77Ybd6XiiGI8lCuG7CNXzQWgDFuNynueA T05Wyw5fJtRxJIMMSNLUEZ5RXxV5+tEMv2eHFTkXaAgh89RiVohzv5BHxEsDY5pmwuoz RGfQ== 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=WIJsimvK; 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 v83si1187606wmv.80.2017.11.29.02.59.04; Wed, 29 Nov 2017 02:59:04 -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=WIJsimvK; 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 ABBC62678C8; Wed, 29 Nov 2017 11:58:45 +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 8AE7B2678C3; Wed, 29 Nov 2017 11:58:42 +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.0 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 4AAA8266E30 for ; Wed, 29 Nov 2017 11:57:46 +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=bxqREgzbELPr/sTi9wW/gNtssbGKeHU4Z/y/h0ejXH4=; b=WIJsimvKL2fN 1VUgHxTFTkebOJVUKOutCUW7mHzc0bG9fMLKS7msgT6PiGBuxN938JI+lYWF4yV+4ZGf5Z5FSGYXV gR5y0Ad1TWLetLQfwQIuy8uTUfYmzk+GZ8n9SYy3BZN1XracU1uMatafpdfnJNNxvd2YECr7bHIK/ XfcGs=; 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 1eK03e-0001IF-Jb; Wed, 29 Nov 2017 10:57:38 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eK03e-00061f-6a; Wed, 29 Nov 2017 10:57:38 +0000 From: Mark Brown To: Maciej S. Szmigiero In-Reply-To: <5c2325bd-3e7b-0026-4c1a-65f32737a74a@maciej.szmigiero.name> Message-Id: Date: Wed, 29 Nov 2017 10:57:38 +0000 Cc: alsa-devel@alsa-project.org, Xiubo Li , Liam Girdwood , Takashi Iwai , linux-kernel , Timur Tabi , Nicolin Chen , Mark Brown , Fabio Estevam , linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] Applied "ASoC: fsl_ssi: call _fsl_ssi_set_dai_fmt() just once in AC'97 mode" 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: call _fsl_ssi_set_dai_fmt() just once in AC'97 mode 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 c997a92a78161af605b314cbe6cf636663999652 Mon Sep 17 00:00:00 2001 From: "Maciej S. Szmigiero" Date: Wed, 22 Nov 2017 00:55:14 +0100 Subject: [PATCH] ASoC: fsl_ssi: call _fsl_ssi_set_dai_fmt() just once in AC'97 mode In AC'97 mode we configure and start SSI RX / TX on probe path via a call to _fsl_ssi_set_dai_fmt() function. We don't need to call this function again later and in fact don't want to do it since this function temporarily sets STCR, SRCR and SCR to some intermediate values. Signed-off-by: Maciej S. Szmigiero Acked-by: Nicolin Chen Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_ssi.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.15.0 _______________________________________________ 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 9e97a0529f37..939d1b8894dc 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1079,6 +1079,9 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) { struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai); + if (fsl_ssi_is_ac97(ssi_private)) + return 0; + return _fsl_ssi_set_dai_fmt(cpu_dai->dev, ssi_private, fmt); }