Skip to content

Commit 8b410b3

Browse files
jbrun3tbroonie
authored andcommitted
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 <[email protected]> Link: https://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent a2417b6 commit 8b410b3

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

sound/soc/meson/axg-fifo.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ struct snd_soc_dai_driver;
2121
struct snd_soc_pcm_runtime;
2222

2323
#define AXG_FIFO_CH_MAX 128
24-
#define AXG_FIFO_RATES (SNDRV_PCM_RATE_5512 | \
25-
SNDRV_PCM_RATE_8000_384000)
2624
#define AXG_FIFO_FORMATS (SNDRV_PCM_FMTBIT_S8 | \
2725
SNDRV_PCM_FMTBIT_S16_LE | \
2826
SNDRV_PCM_FMTBIT_S20_LE | \

sound/soc/meson/axg-frddr.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ static struct snd_soc_dai_driver axg_frddr_dai_drv = {
109109
.stream_name = "Playback",
110110
.channels_min = 1,
111111
.channels_max = AXG_FIFO_CH_MAX,
112-
.rates = AXG_FIFO_RATES,
112+
.rates = SNDRV_PCM_RATE_CONTINUOUS,
113+
.rate_min = 5515,
114+
.rate_max = 384000,
113115
.formats = AXG_FIFO_FORMATS,
114116
},
115117
.ops = &axg_frddr_ops,
@@ -184,7 +186,9 @@ static struct snd_soc_dai_driver g12a_frddr_dai_drv = {
184186
.stream_name = "Playback",
185187
.channels_min = 1,
186188
.channels_max = AXG_FIFO_CH_MAX,
187-
.rates = AXG_FIFO_RATES,
189+
.rates = SNDRV_PCM_RATE_CONTINUOUS,
190+
.rate_min = 5515,
191+
.rate_max = 384000,
188192
.formats = AXG_FIFO_FORMATS,
189193
},
190194
.ops = &g12a_frddr_ops,

sound/soc/meson/axg-toddr.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ static struct snd_soc_dai_driver axg_toddr_dai_drv = {
131131
.stream_name = "Capture",
132132
.channels_min = 1,
133133
.channels_max = AXG_FIFO_CH_MAX,
134-
.rates = AXG_FIFO_RATES,
134+
.rates = SNDRV_PCM_RATE_CONTINUOUS,
135+
.rate_min = 5515,
136+
.rate_max = 384000,
135137
.formats = AXG_FIFO_FORMATS,
136138
},
137139
.ops = &axg_toddr_ops,
@@ -226,7 +228,9 @@ static struct snd_soc_dai_driver g12a_toddr_dai_drv = {
226228
.stream_name = "Capture",
227229
.channels_min = 1,
228230
.channels_max = AXG_FIFO_CH_MAX,
229-
.rates = AXG_FIFO_RATES,
231+
.rates = SNDRV_PCM_RATE_CONTINUOUS,
232+
.rate_min = 5515,
233+
.rate_max = 384000,
230234
.formats = AXG_FIFO_FORMATS,
231235
},
232236
.ops = &g12a_toddr_ops,

0 commit comments

Comments
 (0)