From f743a7adbd6e230d66a6206fa115b59fec2d88eb Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 22 Nov 2023 01:07:42 +0000
Subject: [PATCH] disable pwm7
---
kernel/sound/soc/rockchip/rockchip_pdm.c | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/kernel/sound/soc/rockchip/rockchip_pdm.c b/kernel/sound/soc/rockchip/rockchip_pdm.c
index d7f1f97..1a8ee0f 100644
--- a/kernel/sound/soc/rockchip/rockchip_pdm.c
+++ b/kernel/sound/soc/rockchip/rockchip_pdm.c
@@ -207,22 +207,35 @@
return snd_soc_dai_get_drvdata(dai);
}
-static void rockchip_pdm_drop_fifo(struct rk_pdm_dev *pdm)
-{
- int cnt, val, i;
-
- /* drop the dirty data */
- regmap_read(pdm->regmap, PDM_FIFO_CTRL, &cnt);
- for (i = 0; i < PDM_FIFO_CNT(cnt); i++)
- regmap_read(pdm->regmap, PDM_RXFIFO_DATA, &val);
-}
-
static void rockchip_pdm_rxctrl(struct rk_pdm_dev *pdm, int on)
{
+ unsigned long flags;
+
if (on) {
- rockchip_pdm_drop_fifo(pdm);
+ /* The PDM device need to delete some unused data
+ * since the pdm of various manufacturers can not
+ * be stable quickly. This is done by commit "ASoC:
+ * rockchip: pdm: Fix pop noise in the beginning".
+ *
+ * But we do not know how many data we delete, this
+ * cause channel disorder. For example, we record
+ * two channel 24-bit sound, then delete some starting
+ * data. Because the deleted starting data is uncertain,
+ * the next data may be left or right channel and cause
+ * channel disorder.
+ *
+ * Luckily, we can use the PDM_RX_CLR to fix this.
+ * Use the PDM_RX_CLR to clear fifo written data and
+ * address, but can not clear the read data and address.
+ * In initial state, the read data and address are zero.
+ */
+ local_irq_save(flags);
+ regmap_update_bits(pdm->regmap, PDM_SYSCONFIG,
+ PDM_RX_CLR_MASK,
+ PDM_RX_CLR_WR);
regmap_update_bits(pdm->regmap, PDM_DMA_CTRL,
PDM_DMA_RD_MSK, PDM_DMA_RD_EN);
+ local_irq_restore(flags);
} else {
regmap_update_bits(pdm->regmap, PDM_DMA_CTRL,
PDM_DMA_RD_MSK, PDM_DMA_RD_DIS);
@@ -976,8 +989,10 @@
if (ret != 0 && ret != -ENOENT)
goto err_suspend;
- if (of_property_read_bool(node, "rockchip,no-dmaengine"))
+ if (of_property_read_bool(node, "rockchip,no-dmaengine")) {
+ dev_info(&pdev->dev, "Used for Multi-DAI\n");
return 0;
+ }
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
--
Gitblit v1.6.2