From patchwork Thu Oct 27 16:47:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 104622 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp969672qge; Thu, 27 Oct 2016 20:36:31 -0700 (PDT) X-Received: by 10.194.109.225 with SMTP id hv1mr5454701wjb.179.1477625791051; Thu, 27 Oct 2016 20:36:31 -0700 (PDT) Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id y8si12779194wjy.79.2016.10.27.20.36.29; Thu, 27 Oct 2016 20:36:31 -0700 (PDT) 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; 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: by alsa0.perex.cz (Postfix, from userid 1000) id 3595B267566; Fri, 28 Oct 2016 05:36:29 +0200 (CEST) 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=HEADER_FROM_DIFFERENT_DOMAINS autolearn=disabled version=3.4.0 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E21E0266AF9; Fri, 28 Oct 2016 05:34:07 +0200 (CEST) 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 1D520267457; Thu, 27 Oct 2016 18:47:42 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id A1C33266820 for ; Thu, 27 Oct 2016 18:47:36 +0200 (CEST) Received: from [2001:470:1f1d:6b5::3] (helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bznpx-0001Xu-MR; Thu, 27 Oct 2016 16:47:32 +0000 Received: from broonie by debutante with local (Exim 4.87) (envelope-from ) id 1bznpu-0007fM-VF; Thu, 27 Oct 2016 17:47:26 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87h97yfw51.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Thu, 27 Oct 2016 17:47:26 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure X-Mailman-Approved-At: Thu, 27 Oct 2016 22:41:44 +0200 Cc: tomoharu.fukawa.eb@renesas.com, Linux-ALSA , tomohiro.komagata.aj@renesas.com, mitsuhiro.kimura.kc@renesas.com, triet.huynh.jy@renesas.com, hideya.tanaka.nx@renesas.com, naoya.shiiba.nx@renesas.com, hien.dang.eb@renesas.com, ryo.kodama.vz@renesas.com, takeshi.kihara.df@renesas.com, ryo.kataoka.wt@renesas.com, hiroshige.abe.zc@renesas.com, hiroyuki.yokoyama.vx@renesas.com, yuichi.takagi.uh@renesas.com, Chris.Paterson2@renesas.com, kouei.abe.cp@renesas.com, ren.imaoka.vj@renesas.com, Simon , takahiko.gomi.yn@renesas.com, satoshi.okada.wz@renesas.com, yoshifumi.hosoya.wj@renesas.com, takamitsu.honda.pv@renesas.com, khiem.nguyen.xt@renesas.com, yuta.wakasawa.pv@renesas.com, Mark Brown , naohiro.nishikawa.uj@renesas.com, harunobu.kurokawa.dn@renesas.com Subject: [alsa-devel] Applied "ASoC: rsnd: enable SRC sync even FIN = FOUT" 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: rsnd: enable SRC sync even FIN = FOUT has been applied to the asoc tree at git://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 67923f779b8d9d210c5ec98ffb68d9fe5a68df18 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 27 Oct 2016 01:05:21 +0000 Subject: [PATCH] ASoC: rsnd: enable SRC sync even FIN = FOUT Current SRC (= Sampling Rate Converter) is supporting SYNC mode and ASYNC mode. Current src.c cares SRC if FIN != FOUT. Here, SYNC mode will be used for tweak, so it will be used even FIN = FOUT. This patch enables SRC sync in such situation Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama Tested-by: Yuichi Takagi Signed-off-by: Mark Brown --- sound/soc/sh/rcar/src.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.8.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index aa24258b9b14..3a8f65bd1bf9 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -189,6 +189,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, struct rsnd_priv *priv = rsnd_mod_to_priv(mod); struct device *dev = rsnd_priv_to_dev(priv); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); + int use_src = 0; u32 fin, fout; u32 ifscr, fsrate, adinr; u32 cr, route; @@ -214,6 +215,8 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, return; } + use_src = (fin != fout) | rsnd_src_sync_is_enabled(mod); + /* * SRC_ADINR */ @@ -225,7 +228,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, */ ifscr = 0; fsrate = 0; - if (fin != fout) { + if (use_src) { u64 n; ifscr = 1; @@ -239,7 +242,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, */ cr = 0x00011110; route = 0x0; - if (fin != fout) { + if (use_src) { route = 0x1; if (rsnd_src_sync_is_enabled(mod)) {