summaryrefslogtreecommitdiff
path: root/sound/soc/meson/axg-fifo.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2023-10-31 08:58:36 +0100
committerTakashi Iwai <tiwai@suse.de>2023-10-31 08:58:36 +0100
commitc468b5dd759ede754b23cbc9c50b048a781d4217 (patch)
tree3ec5f17b34fbb4711253fc4698d9cacbf6b9e71b /sound/soc/meson/axg-fifo.c
parent99248c8902f505ec064cf2b0f74629016f2f4c82 (diff)
parentf71e0be5d297b25453fdf4c1757b3e83e94b5f98 (diff)
Merge branch 'for-next' into for-linus
Pull 6.7 materials Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/meson/axg-fifo.c')
-rw-r--r--sound/soc/meson/axg-fifo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c
index bccfb770b339..65541fdb0038 100644
--- a/sound/soc/meson/axg-fifo.c
+++ b/sound/soc/meson/axg-fifo.c
@@ -31,7 +31,7 @@ static struct snd_pcm_hardware axg_fifo_hw = {
SNDRV_PCM_INFO_NO_PERIOD_WAKEUP),
.formats = AXG_FIFO_FORMATS,
.rate_min = 5512,
- .rate_max = 192000,
+ .rate_max = 384000,
.channels_min = 1,
.channels_max = AXG_FIFO_CH_MAX,
.period_bytes_min = AXG_FIFO_BURST,
@@ -47,7 +47,7 @@ static struct snd_soc_dai *axg_fifo_dai(struct snd_pcm_substream *ss)
{
struct snd_soc_pcm_runtime *rtd = ss->private_data;
- return asoc_rtd_to_cpu(rtd, 0);
+ return snd_soc_rtd_to_cpu(rtd, 0);
}
static struct axg_fifo *axg_fifo_data(struct snd_pcm_substream *ss)