From patchwork Wed Nov 8 16:08: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: 10048741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5C563603FA for ; Wed, 8 Nov 2017 16:09:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CB7128A24 for ; Wed, 8 Nov 2017 16:09:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FC2428AE3; Wed, 8 Nov 2017 16:09:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CA72B292F9 for ; Wed, 8 Nov 2017 16:09:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=S65TzkSS0Ef7F6/4y6dHp9ax4ZJi349RKcWgkg/XNVk=; b=Pp5 13D4X19Yx5l0jN6KhvVousWxpFtKVftX3xSUcsgQgObBAmT0fauK+ljpPNckNuo3XCrYJNhuJ6JzG qbfXJnMZnsIEvRDQhNq/pxajdtJLrhSe8ue6sX5now+ib9fn+uYVPnj0Chos00LitRim0M+6A3lSK 4H3tL2AysTq/qkY3U4t5VX4ezUjj0j49yrMOhlGqK0p8+y/pXsGXEnLymkw/fqLK6B1TbTS/M5CRy Y75C8IUfhzsRI8E3QioUv04LfPsO0kgDC2daKCMp2Ldx7PQN/2OXFWk/ufEpKPXEzNM38MP96KK+D u6qJTVyAqJ3PVTnqrTrbUcJZv2Q0zyw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eCSvE-0007NJ-2P; Wed, 08 Nov 2017 16:09:48 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCSvB-0007IX-Kt for linux-arm-kernel@bombadil.infradead.org; Wed, 08 Nov 2017 16:09:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; 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=Jo6/l1L5lbJhnkJ9/rnM4I87fYv848RoGSQpJL5x+RE=; b=Q+j2T5siMwoGYSNwHEXfyVBlML ynQwomT4OOB4Ml6fQ5vlXWB63vfReDE1SIJSfdOGXwBq6W6s9i7wnMyhAsI0hGigUsRG6gRmpwEt6 +QKhiRLUat5rbrRGWM4xDKr7HP/aVJ4Qm4lem6bDMeMnlCDF7o9Lwzb9paBl6xX9XWr4kThhpikcw Daf9VHnyAEniOfGEcyS1l6QbF6kHWAhEh1z6zvqXYMz/RE5VHceXr4MgDN804fVtrgPwEcEHGiTcc zg0kzpO1iX7iyWjfPnr0DDzYzLLcRNBH0vbKfxaHASC3JxDQnNStQKBUhDtPAsug3RNnU8BL1CzIz Zk481ZUA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCSv8-0002jX-F6 for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2017 16:09:43 +0000 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=Jo6/l1L5lbJhnkJ9/rnM4I87fYv848RoGSQpJL5x+RE=; b=pI7jKiCy/T3y /RUUOujGvV6HqJI8PYzvXYr8QmL7cOG540mx68DcgMDWWnJuNEv+JgwX1ZYYgN2K4aDlS/xV4C5vj k/+FgJ01NjhBzPzx+S+xOTMdbJKYYvUMupSZUkwfXXB+ccVNNJmc0GjRTSr0gXSPOnNx4IDPO5Awk G5IGo=; 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 1eCStb-0003EC-Qk; Wed, 08 Nov 2017 16:08:07 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eCStb-0002F5-Ck; Wed, 08 Nov 2017 16:08:07 +0000 From: Mark Brown To: olivier moysan Subject: Applied "ASoC: stm32: spdifrx: fix 16 bits capture" to the asoc tree In-Reply-To: <1509981533-28622-2-git-send-email-olivier.moysan@st.com> Message-Id: Date: Wed, 08 Nov 2017 16:08:07 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, robh@kernel.org, alsa-devel@alsa-project.org, olivier.moysan@st.com, alexandre.torgue@st.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, arnaud.pouliquen@st.com, tiwai@suse.com, lgirdwood@gmail.com, broonie@kernel.org, mcoquelin.stm32@gmail.com, benjamin.gaignard@st.com, perex@perex.cz, linux-arm-kernel@lists.infradead.org, kernel@stlinux.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: stm32: spdifrx: fix 16 bits capture 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 9036e4acc81700a51e5f42820ba4570bea9b6f48 Mon Sep 17 00:00:00 2001 From: olivier moysan Date: Mon, 6 Nov 2017 16:18:52 +0100 Subject: [PATCH] ASoC: stm32: spdifrx: fix 16 bits capture Change DMA bus width to manage properly 16 bits packed format. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown --- sound/soc/stm/stm32_spdifrx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index 84cc5678beba..d7dbe84d5eeb 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -750,17 +750,21 @@ static int stm32_spdifrx_hw_params(struct snd_pcm_substream *substream, switch (data_size) { case 16: fmt = SPDIFRX_DRFMT_PACKED; - spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; break; case 32: fmt = SPDIFRX_DRFMT_LEFT; - spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; break; default: dev_err(&spdifrx->pdev->dev, "Unexpected data format\n"); return -EINVAL; } + /* + * Set buswidth to 4 bytes for all data formats. + * Packed format: transfer 2 x 2 bytes samples + * Left format: transfer 1 x 3 bytes samples + 1 dummy byte + */ + spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; snd_soc_dai_init_dma_data(cpu_dai, NULL, &spdifrx->dma_params); return regmap_update_bits(spdifrx->regmap, STM32_SPDIFRX_CR,