From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/sound/soc/rockchip/rockchip_i2s.c | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/kernel/sound/soc/rockchip/rockchip_i2s.c b/kernel/sound/soc/rockchip/rockchip_i2s.c
index 4e27cbd..587d80b 100644
--- a/kernel/sound/soc/rockchip/rockchip_i2s.c
+++ b/kernel/sound/soc/rockchip/rockchip_i2s.c
@@ -21,6 +21,8 @@
#include <sound/dmaengine_pcm.h>
#include "rockchip_i2s.h"
+#include "rockchip_dlp_pcm.h"
+#include "rockchip_utils.h"
#define DRV_NAME "rockchip-i2s"
@@ -333,6 +335,25 @@
return ret;
}
+static void rockchip_i2s_get_performance(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai,
+ unsigned int csr)
+{
+ struct rk_i2s_dev *i2s = to_info(dai);
+ unsigned int tdl;
+ int fifo;
+
+ regmap_read(i2s->regmap, I2S_DMACR, &tdl);
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ fifo = I2S_DMACR_TDL_V(tdl) * I2S_TXCR_CSR_V(csr);
+ else
+ fifo = I2S_DMACR_RDL_V(tdl) * I2S_RXCR_CSR_V(csr);
+
+ rockchip_utils_get_performance(substream, params, dai, fifo);
+}
+
static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
@@ -400,6 +421,8 @@
return -EINVAL;
}
+ rockchip_i2s_get_performance(substream, params, dai, val);
+
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
regmap_update_bits(i2s->regmap, I2S_RXCR,
I2S_RXCR_VDW_MASK | I2S_RXCR_CSR_MASK,
@@ -437,6 +460,14 @@
I2S_DMACR_TDL(16));
regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK,
I2S_DMACR_RDL(16));
+
+ return 0;
+}
+
+static int rockchip_i2s_hw_free(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+{
+ rockchip_utils_put_performance(substream, dai);
return 0;
}
@@ -571,8 +602,8 @@
static int rockchip_i2s_clk_compensation_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
- struct rk_i2s_dev *i2s = snd_soc_dai_get_drvdata(dai);
+ struct snd_soc_component *compnt = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_dev *i2s = snd_soc_component_get_drvdata(compnt);
ucontrol->value.integer.value[0] = i2s->clk_ppm;
@@ -582,8 +613,8 @@
static int rockchip_i2s_clk_compensation_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
- struct rk_i2s_dev *i2s = snd_soc_dai_get_drvdata(dai);
+ struct snd_soc_component *compnt = snd_soc_kcontrol_component(kcontrol);
+ struct rk_i2s_dev *i2s = snd_soc_component_get_drvdata(compnt);
int ppm = ucontrol->value.integer.value[0];
if ((ucontrol->value.integer.value[0] < CLK_PPM_MIN) ||
@@ -646,6 +677,7 @@
.startup = rockchip_i2s_startup,
.shutdown = rockchip_i2s_shutdown,
.hw_params = rockchip_i2s_hw_params,
+ .hw_free = rockchip_i2s_hw_free,
.set_bclk_ratio = rockchip_i2s_set_bclk_ratio,
.set_sysclk = rockchip_i2s_set_sysclk,
.set_fmt = rockchip_i2s_set_fmt,
@@ -798,7 +830,8 @@
case I2S_CLR:
case I2S_TXDR:
case I2S_RXDR:
- case I2S_FIFOLR:
+ case I2S_TXFIFOLR:
+ case I2S_RXFIFOLR:
case I2S_INTSR:
return true;
default:
@@ -811,7 +844,8 @@
switch (reg) {
case I2S_INTSR:
case I2S_CLR:
- case I2S_FIFOLR:
+ case I2S_TXFIFOLR:
+ case I2S_RXFIFOLR:
case I2S_TXDR:
case I2S_RXDR:
return true;
@@ -938,7 +972,7 @@
i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
i2s->playback_dma_data.maxburst = 8;
- if (!of_property_read_u32(node, "rockchip,playback-channels", &val)) {
+ if (!device_property_read_u32(i2s->dev, "rockchip,playback-channels", &val)) {
if (val >= 2 && val <= 8)
dai->playback.channels_max = val;
}
@@ -960,14 +994,14 @@
i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
i2s->capture_dma_data.maxburst = 8;
- if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) {
+ if (!device_property_read_u32(i2s->dev, "rockchip,capture-channels", &val)) {
if (val >= 2 && val <= 8)
dai->capture.channels_max = val;
}
}
i2s->clk_trcm = I2S_CKR_TRCM_TXRX;
- if (!of_property_read_u32(node, "rockchip,clk-trcm", &val)) {
+ if (!device_property_read_u32(i2s->dev, "rockchip,clk-trcm", &val)) {
if (val >= 0 && val <= 2) {
i2s->clk_trcm = val << I2S_CKR_TRCM_SHIFT;
if (i2s->clk_trcm)
@@ -1015,6 +1049,36 @@
return 0;
}
+
+static int rockchip_i2s_get_fifo_count(struct device *dev,
+ struct snd_pcm_substream *substream)
+{
+ struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
+ unsigned int tx, rx;
+ int val = 0;
+
+ regmap_read(i2s->regmap, I2S_TXFIFOLR, &tx);
+ regmap_read(i2s->regmap, I2S_RXFIFOLR, &rx);
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ val = I2S_FIFOLR_XFL3(tx) +
+ I2S_FIFOLR_XFL2(tx) +
+ I2S_FIFOLR_XFL1(tx) +
+ I2S_FIFOLR_XFL0(tx);
+ else
+ /* XFL4 is compatible for old version */
+ val = I2S_FIFOLR_XFL4(tx) +
+ I2S_FIFOLR_XFL3(rx) +
+ I2S_FIFOLR_XFL2(rx) +
+ I2S_FIFOLR_XFL1(rx) +
+ I2S_FIFOLR_XFL0(rx);
+
+ return val;
+}
+
+static const struct snd_dlp_config dconfig = {
+ .get_fifo_count = rockchip_i2s_get_fifo_count,
+};
static int rockchip_i2s_probe(struct platform_device *pdev)
{
@@ -1067,7 +1131,7 @@
dev_set_drvdata(&pdev->dev, i2s);
i2s->mclk_calibrate =
- of_property_read_bool(node, "rockchip,mclk-calibrate");
+ device_property_read_bool(&pdev->dev, "rockchip,mclk-calibrate");
if (i2s->mclk_calibrate) {
i2s->mclk_root = devm_clk_get(&pdev->dev, "i2s_clk_root");
if (IS_ERR(i2s->mclk_root))
@@ -1136,12 +1200,16 @@
goto err_suspend;
}
- if (of_property_read_bool(node, "rockchip,no-dmaengine")) {
+ if (device_property_read_bool(&pdev->dev, "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 (device_property_read_bool(&pdev->dev, "rockchip,digital-loopback"))
+ ret = devm_snd_dmaengine_dlp_register(&pdev->dev, &dconfig);
+ else
+ ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
+
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
goto err_suspend;
--
Gitblit v1.6.2