From patchwork Wed May 24 17:42:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 104351 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp391509qge; Wed, 24 May 2017 10:45:33 -0700 (PDT) X-Received: by 10.28.215.67 with SMTP id o64mr7231593wmg.69.1495647933169; Wed, 24 May 2017 10:45:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495647933; cv=none; d=google.com; s=arc-20160816; b=osr3ENJCf5sXmJ3Ks2d0WeL8GMHlzp4vW1CjjBMHOHzpGWQcmju4sUwN4MQRAzP7si 6B00PQppf1GBNBytkXTljNM3L8X/Qxbnrm0K16wAXPMdrrQLvtXFSL6hHvR/aod1vesL C6CTZBHdyCZ8VOUTwvDv7WXerruypXMnl6wW12T+IGNcjQfKbt/z/4/scqEMZ8v5Cm/H 6QOz4iFSLaULb+PAFB16H/RnTsYe9FyOVH7uMeeyu8NwHZ5jJccQf54M/lu3r3ACt6Go 9IhEaDCSG6CxSmQ6BzxqqGcd31nPFev7UhO9SBTaLYfVvF6f0wSw6HrZaLk1kEo10oeO oZcA== 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 :delivered-to:arc-authentication-results; bh=EsA+R9QvhPk6ZAFIsabRZuSJM94I4VjCYxUVaWZmRxA=; b=ysGo47PRQlCenPvh3/fgDKvGEYgjEWJwDuta9yUc6eEd83JEVnuBebA+wakjVXPXQy QF2SP046GRMFsXWHuoCEbCBH/HdnU64ZrxXZRVAK0ORFoCnnFvJpyYc2UkSObbnV3Adf 8IbZvm5KQEM8CQ3G/9Wdk61y3xeFfLJh66nGyvbZby4GacnrXmXAlGTrNSQJXx3687AF QuivPCv7nJ8vPzFyQSkCGNimDJK9Wroa99xZU1Anb5cUt45T1UAyuQUc+T/0640VDkgM aDCD+i3uBdWMiF8bnRjQU57K1lovV9iCjhcCbNCylPcGkRHItCHAZm9dPyJX/YYdclVF 2crA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id t30si20322894wrc.41.2017.05.24.10.45.32; Wed, 24 May 2017 10:45:33 -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: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D50852673A2; Wed, 24 May 2017 19:43:06 +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 8A14826739E; Wed, 24 May 2017 19:43:05 +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, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 440412673A4 for ; Wed, 24 May 2017 19:42:16 +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 1dDaIU-0004wX-8V; Wed, 24 May 2017 17:42:12 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dDaIR-0002tb-Hw; Wed, 24 May 2017 18:42:07 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87k257oy6t.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 24 May 2017 18:42:07 +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 Cc: linux-renesas-soc@vger.kernel.org, alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: rsnd: SSI PIO adjust to 24bit 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: rsnd: SSI PIO adjust to 24bit mode 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 7819a942de7b993771bd9377babc80485fe7606b Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 24 May 2017 01:17:10 +0000 Subject: [PATCH] ASoC: rsnd: SSI PIO adjust to 24bit mode commit 90431eb49bff ("ASoC: rsnd: don't use PDTA bit for 24bit on SSI") fixups 24bit mode data alignment, but PIO was not cared. This patch fixes PIO mode 24bit data alignment Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ 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/ssi.c b/sound/soc/sh/rcar/ssi.c index c224695c1484..91e5c07911b4 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -550,6 +550,13 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); u32 *buf = (u32 *)(runtime->dma_area + rsnd_dai_pointer_offset(io, 0)); + int shift = 0; + + switch (runtime->sample_bits) { + case 32: + shift = 8; + break; + } /* * 8/16/32 data can be assesse to TDR/RDR register @@ -557,9 +564,9 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, * see rsnd_ssi_init() */ if (rsnd_io_is_play(io)) - rsnd_mod_write(mod, SSITDR, *buf); + rsnd_mod_write(mod, SSITDR, (*buf) << shift); else - *buf = rsnd_mod_read(mod, SSIRDR); + *buf = (rsnd_mod_read(mod, SSIRDR) >> shift); elapsed = rsnd_dai_pointer_update(io, sizeof(*buf)); }