Applied "ASoC: rockchip: pdm: adjust waterlevel in frame unit" to the asoc tree

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Mark Brown <broonie@kernel.org>
To: Sugar Zhang <sugar.zhang@rock-chips.com>
Cc: Mark Brown <broonie@kernel.org>,
	heiko@sntech.de, broonie@kernel.org, alsa-devel@alsa-project.org,
	linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	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
Date: Thu,  4 Apr 2019 15:16:34 +0700 (+07)	[thread overview]
Message-ID: <20190404081634.31E08441D3C@finisterre.ee.mobilebroadband> (raw)
In-Reply-To: <1554350189-24318-1-git-send-email-sugar.zhang@rock-chips.com>

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 <sugar.zhang@rock-chips.com>
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 <sugar.zhang@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 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

WARNING: multiple messages have this Message-ID (diff)

From: Mark Brown <broonie@kernel.org>
To: Sugar Zhang <sugar.zhang@rock-chips.com>
Cc: Mark Brown <broonie@kernel.org>,
	heiko@sntech.debroonie@kernel.org, alsa-devel@alsa-project.org,
	linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.orgalsa-devel@alsa-project.org
Subject: Applied "ASoC: rockchip: pdm: adjust waterlevel in frame unit" to the asoc tree
Date: Thu,  4 Apr 2019 15:16:34 +0700 (+07)	[thread overview]
Message-ID: <20190404081634.31E08441D3C@finisterre.ee.mobilebroadband> (raw)
In-Reply-To: <1554350189-24318-1-git-send-email-sugar.zhang@rock-chips.com>

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 <sugar.zhang@rock-chips.com>
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 <sugar.zhang@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 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

WARNING: multiple messages have this Message-ID (diff)

From: Mark Brown <broonie@kernel.org>
To: Sugar Zhang <sugar.zhang@rock-chips.com>
Cc: Mark Brown <broonie@kernel.org>,
	heiko@sntech.debroonie@kernel.org, alsa-devel@alsa-project.org,
	linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.orgalsa-devel@alsa-project.org
Subject: Applied "ASoC: rockchip: pdm: adjust waterlevel in frame unit" to the asoc tree
Date: Thu,  4 Apr 2019 15:16:34 +0700 (+07)	[thread overview]
Message-ID: <20190404081634.31E08441D3C@finisterre.ee.mobilebroadband> (raw)
In-Reply-To: <1554350189-24318-1-git-send-email-sugar.zhang@rock-chips.com>

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 <sugar.zhang@rock-chips.com>
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 <sugar.zhang@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 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

WARNING: multiple messages have this Message-ID (diff)

From: Mark Brown <broonie@kernel.org>
To: Sugar Zhang <sugar.zhang@rock-chips.com>
Cc: alsa-devel@alsa-project.org, heiko@sntech.de,
	linux-kernel@vger.kernel.org, Liam Girdwood <lgirdwood@gmail.com>,
	Takashi Iwai <tiwai@suse.com>,
	linux-rockchip@lists.infradead.org, broonie@kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: Applied "ASoC: rockchip: pdm: adjust waterlevel in frame unit" to the asoc tree
Date: Thu,  4 Apr 2019 15:16:34 +0700 (+07)	[thread overview]
Message-ID: <20190404081634.31E08441D3C@finisterre.ee.mobilebroadband> (raw)
In-Reply-To: <1554350189-24318-1-git-send-email-sugar.zhang@rock-chips.com>

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 <sugar.zhang@rock-chips.com>
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 <sugar.zhang@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

next prev parent reply	other threads:[~2019-04-04  8:16 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-03 13:40 [PATCH v1 0/12] Patches to update pdm for rockchip socs Sugar Zhang
2019-04-03 13:40 ` [PATCH v1 01/12] ASoC: rockchip: pdm: fix regmap_ops hang issue Sugar Zhang
2019-04-04  8:17   ` Applied "ASoC: rockchip: pdm: fix regmap_ops hang issue" to the asoc tree Mark Brown
2019-04-04  8:17     ` Mark Brown
2019-04-04  8:17     ` Mark Brown
2019-04-04  8:17     ` Mark Brown
2019-04-03 13:40 ` [PATCH v1 02/12] ASoC: rockchip: pdm: using left justified store mode Sugar Zhang
2019-04-04  7:51   ` Mark Brown
2019-04-04  7:51     ` Mark Brown
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: using left justified store mode" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-03 13:40 ` [PATCH v1 03/12] ASoC: rockchip: pdm: add default regs Sugar Zhang
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: add default regs" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-03 13:40 ` [PATCH v1 04/12] ASoC: rockchip: pdm: optimize clear logic Sugar Zhang
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: optimize clear logic" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:48 ` [PATCH v1 05/12] ASoC: rockchip: pdm: change dma burst to 8 Sugar Zhang
2019-04-04  3:48   ` Sugar Zhang
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: change dma burst to 8" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:51 ` [PATCH v1 06/12] ASoC: rockchip: pdm: fixup pdm fractional div Sugar Zhang
2019-04-04  3:51   ` Sugar Zhang
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: fixup pdm fractional div" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:53 ` [PATCH v1 07/12] dt-bindings: sound: rockchip: add compatible for rk3308/px30 Sugar Zhang
2019-04-04  3:53   ` Sugar Zhang
2019-04-04  8:16   ` Applied "dt-bindings: sound: rockchip: add compatible for rk3308/px30" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:54 ` [PATCH v1 08/12] ASoC: rockchip: pdm: add compatible for rk1808 Sugar Zhang
2019-04-04  3:54   ` Sugar Zhang
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: add compatible for rk1808" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:55 ` [PATCH v1 09/12] dt-bindings: sound: add compatible for rk1808 Sugar Zhang
2019-04-04  3:55   ` Sugar Zhang
2019-04-04  8:16   ` Applied "dt-bindings: sound: add compatible for rk1808" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:56 ` [PATCH v1 10/12] ASoC: rockchip: pdm: adjust waterlevel in frame unit Sugar Zhang
2019-04-04  3:56   ` Sugar Zhang
2019-04-04  8:16   ` Mark Brown [this message]
2019-04-04  8:16     ` Applied "ASoC: rockchip: pdm: adjust waterlevel in frame unit" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:57 ` [PATCH v1 11/12] ASoC: rockchip: pdm: Mark RXFIFO_DATA as volatile and precious Sugar Zhang
2019-04-04  3:57   ` Sugar Zhang
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: Mark RXFIFO_DATA as volatile and precious" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  3:57 ` [PATCH v1 12/12] ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value Sugar Zhang
2019-04-04  3:57   ` Sugar Zhang
2019-04-04  8:16   ` Applied "ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value" to the asoc tree Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown
2019-04-04  8:16     ` Mark Brown

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:3e1c5fd5b32 dfblob:3e1c5fd5b32 dfblob:3e1c5fd5b32
dfblob:3e1c5fd5b32 dfblob:955cdc2b8fc dfblob:955cdc2b8fc
dfblob:955cdc2b8fc dfblob:955cdc2b8fc
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190404081634.31E08441D3C@finisterre.ee.mobilebroadband \
    --to=broonie@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=heiko@sntech.de \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=sugar.zhang@rock-chips.com \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.