mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-12-15 08:39:51 +00:00
91 lines
3.0 KiB
Diff
91 lines
3.0 KiB
Diff
From 453af3a1ee8cea68dfdbdaed7a0a41f4a3743c76 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Fri, 23 Feb 2024 18:51:11 +0100
|
|
Subject: [PATCH 33/53] FROMLIST(v1): ASoC: meson: axg-fifo: take continuous
|
|
rates
|
|
|
|
The rate of the stream does not matter for the fifos of the axg family.
|
|
Fifos will just push or pull data to/from the DDR according to consumption
|
|
or production of the downstream element, which is the DPCM backend.
|
|
|
|
Drop the rate list and allow continuous rates. The lower and upper rate are
|
|
set according what is known to work with the different backends
|
|
|
|
This allows the PDM input backend to also use continuous rates.
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
---
|
|
sound/soc/meson/axg-fifo.h | 2 --
|
|
sound/soc/meson/axg-frddr.c | 8 ++++++--
|
|
sound/soc/meson/axg-toddr.c | 8 ++++++--
|
|
3 files changed, 12 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/sound/soc/meson/axg-fifo.h b/sound/soc/meson/axg-fifo.h
|
|
index df528e8cb7c9..a14c31eb06d8 100644
|
|
--- a/sound/soc/meson/axg-fifo.h
|
|
+++ b/sound/soc/meson/axg-fifo.h
|
|
@@ -21,8 +21,6 @@ struct snd_soc_dai_driver;
|
|
struct snd_soc_pcm_runtime;
|
|
|
|
#define AXG_FIFO_CH_MAX 128
|
|
-#define AXG_FIFO_RATES (SNDRV_PCM_RATE_5512 | \
|
|
- SNDRV_PCM_RATE_8000_384000)
|
|
#define AXG_FIFO_FORMATS (SNDRV_PCM_FMTBIT_S8 | \
|
|
SNDRV_PCM_FMTBIT_S16_LE | \
|
|
SNDRV_PCM_FMTBIT_S20_LE | \
|
|
diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c
|
|
index 8c166a5f338c..98140f449eb3 100644
|
|
--- a/sound/soc/meson/axg-frddr.c
|
|
+++ b/sound/soc/meson/axg-frddr.c
|
|
@@ -109,7 +109,9 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = {
|
|
.stream_name = "Playback",
|
|
.channels_min = 1,
|
|
.channels_max = AXG_FIFO_CH_MAX,
|
|
- .rates = AXG_FIFO_RATES,
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
|
|
+ .rate_min = 5515,
|
|
+ .rate_max = 384000,
|
|
.formats = AXG_FIFO_FORMATS,
|
|
},
|
|
.ops = &axg_frddr_ops,
|
|
@@ -184,7 +186,9 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = {
|
|
.stream_name = "Playback",
|
|
.channels_min = 1,
|
|
.channels_max = AXG_FIFO_CH_MAX,
|
|
- .rates = AXG_FIFO_RATES,
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
|
|
+ .rate_min = 5515,
|
|
+ .rate_max = 384000,
|
|
.formats = AXG_FIFO_FORMATS,
|
|
},
|
|
.ops = &g12a_frddr_ops,
|
|
diff --git a/sound/soc/meson/axg-toddr.c b/sound/soc/meson/axg-toddr.c
|
|
index 1a0be177b8fe..32ee45cce7f8 100644
|
|
--- a/sound/soc/meson/axg-toddr.c
|
|
+++ b/sound/soc/meson/axg-toddr.c
|
|
@@ -131,7 +131,9 @@ static struct snd_soc_dai_driver axg_toddr_dai_drv = {
|
|
.stream_name = "Capture",
|
|
.channels_min = 1,
|
|
.channels_max = AXG_FIFO_CH_MAX,
|
|
- .rates = AXG_FIFO_RATES,
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
|
|
+ .rate_min = 5515,
|
|
+ .rate_max = 384000,
|
|
.formats = AXG_FIFO_FORMATS,
|
|
},
|
|
.ops = &axg_toddr_ops,
|
|
@@ -226,7 +228,9 @@ static struct snd_soc_dai_driver g12a_toddr_dai_drv = {
|
|
.stream_name = "Capture",
|
|
.channels_min = 1,
|
|
.channels_max = AXG_FIFO_CH_MAX,
|
|
- .rates = AXG_FIFO_RATES,
|
|
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
|
|
+ .rate_min = 5515,
|
|
+ .rate_max = 384000,
|
|
.formats = AXG_FIFO_FORMATS,
|
|
},
|
|
.ops = &g12a_toddr_ops,
|
|
--
|
|
2.34.1
|
|
|