Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp966747yba; Thu, 4 Apr 2019 01:17:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7CnYbx3LcGnxKqE73NLRK0Wz6EF4ZFTVJ4HVkogcOOyhpCbTtN2uxiNRDmFqCERRkwX6l X-Received: by 2002:a17:902:8bca:: with SMTP id r10mr4962005plo.67.1554365875494; Thu, 04 Apr 2019 01:17:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554365875; cv=none; d=google.com; s=arc-20160816; b=X13DVyz/iSz8Uqy3f848S4QzDDb5zOpFNbTmVBvZkTKmF2TZYXWLP8w//VOFxBOuA+ ljffNNRMVfKNbPx3KObiDSkAtWuG//+mY805TqpTSmykWnqj2Doxs49AlXzANwzNfUxJ 69Ij5cIhPWCVE4QvoNxsNJfZTGJcMT3oY2mOtYXNxywbywLzPgOjqp7IZstgM8FK+VRg 4j9+QnO1/f46S1QMTPYXkJqmXJlw7906yYn6fuik31dCy300/MLbJfxgRKTAVdcNP263 pShorIF62SDX0rDwWxgrQ1RvZAjKgRZLfXl3nrlWFVb5dLotJd1h+2iBasOak27D8jNq wMAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:message-id:in-reply-to:subject:cc:to :from:dkim-signature; bh=PrnYjYHuYvUZMhArmhzlQALpatUZSD7hDW/5dPA6pt8=; b=g52UP6Ib7DggMhybeZY2yYtjOhVc6hkVqu1x9u7pHOygOKtZ427yIKPbjk+Jiv6VYn BOtkaZCvnLNCWA+y6selvDSVVnLFavBSaH/7WgdUuwwtnGbS0U+L1vu4AR7EE7mwugl3 31fF+edVHhb17he4ipYPimPX2DbW6IV6q9ydpqyObS/v7YSTMObbH6lTZ5hYIzsFPZkg 7t+sAaBVlmdoCUBeCtF2IpbYAGeIofMMNNiu0W/R7b1G7/0yXeGEE/ZrvJzQDTSZ8wvF a729dOjhlWE6CAl2Iuh6DwxQZkhE05KYe6ZGCsmQBcw+FgoYdtUg5YphNKIuF9svtgkK EyWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b="l3oIR/0F"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e14si15723228pff.76.2019.04.04.01.17.40; Thu, 04 Apr 2019 01:17:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b="l3oIR/0F"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728671AbfDDIQw (ORCPT + 99 others); Thu, 4 Apr 2019 04:16:52 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:50434 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728553AbfDDIQt (ORCPT ); Thu, 4 Apr 2019 04:16:49 -0400 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=PrnYjYHuYvUZMhArmhzlQALpatUZSD7hDW/5dPA6pt8=; b=l3oIR/0FWhjn j4u3CIAfLCkFcd++CwEoMR6ndBN7aXm5mslKjiaB1Jrk+H0VVr08qwTGrK1tz8dxW8gCU7INWJKjb 1iCqEkcPc3b8MZ4sqNNQe048m0hxqpm4FDjTz20NWy7AqLxJpznxRI4tQqqkb6i9Qb14b9W4fCl1f sRnG8=; Received: from [147.50.13.10] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hBxY5-00051N-8x; Thu, 04 Apr 2019 08:16:37 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 31E08441D3C; Thu, 4 Apr 2019 15:16:34 +0700 (+07) From: Mark Brown To: Sugar Zhang Cc: Mark Brown , heiko@sntech.de, broonie@kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org Subject: Applied "ASoC: rockchip: pdm: adjust waterlevel in frame unit" to the asoc tree In-Reply-To: <1554350189-24318-1-git-send-email-sugar.zhang@rock-chips.com> X-Patchwork-Hint: ignore Message-Id: <20190404081634.31E08441D3C@finisterre.ee.mobilebroadband> Date: Thu, 4 Apr 2019 15:16:34 +0700 (+07) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch ASoC: rockchip: pdm: adjust waterlevel in frame unit 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 430f5da69b9323d5e7faca95bc30e61be4fcbbbf Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Thu, 4 Apr 2019 11:56:29 +0800 Subject: [PATCH] ASoC: rockchip: pdm: adjust waterlevel in frame unit This patch make the waterlevel more reasonable, because the pdm controller share the single FIFO(128 entries) with each channel. adjust waterlevel in frame to meet the vad or dma frames request. Signed-off-by: Sugar Zhang Signed-off-by: Mark Brown --- sound/soc/rockchip/rockchip_pdm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 3e1c5fd5b32b..955cdc2b8fc5 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -255,8 +255,9 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(pdm->regmap, PDM_CTRL0, PDM_PATH_MSK | PDM_VDW_MSK, val); + /* all channels share the single FIFO */ regmap_update_bits(pdm->regmap, PDM_DMA_CTRL, PDM_DMA_RDL_MSK, - PDM_DMA_RDL(16)); + PDM_DMA_RDL(8 * params_channels(params))); return 0; } -- 2.20.1