diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
| commit | c6141ba0110f98266106699aca071fed025c3d64 (patch) | |
| tree | 5b2c335cbed607d85e2fa51c54e29a2e4b0eb24d /sound/soc/tegra | |
| parent | a1462fb8b5dd1018e3477a6861822d75c6a59449 (diff) | |
| parent | 927e6bec5cf3624665b0a2e9f64a1d32f3d22cdd (diff) | |
| download | linux-next-c6141ba0110f98266106699aca071fed025c3d64.tar.gz linux-next-c6141ba0110f98266106699aca071fed025c3d64.zip | |
ASoC: Merge up fixes
Merge branch 'for-6.14' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.15 to avoid a bunch of add/add conflicts.
Diffstat (limited to 'sound/soc/tegra')
| -rw-r--r-- | sound/soc/tegra/tegra210_adx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c index 3e6e8f51f380..0aa93b948378 100644 --- a/sound/soc/tegra/tegra210_adx.c +++ b/sound/soc/tegra/tegra210_adx.c @@ -264,7 +264,7 @@ static const struct snd_soc_dai_ops tegra210_adx_out_dai_ops = { .rates = SNDRV_PCM_RATE_8000_192000, \ .formats = SNDRV_PCM_FMTBIT_S8 | \ SNDRV_PCM_FMTBIT_S16_LE | \ - SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .capture = { \ @@ -274,7 +274,7 @@ static const struct snd_soc_dai_ops tegra210_adx_out_dai_ops = { .rates = SNDRV_PCM_RATE_8000_192000, \ .formats = SNDRV_PCM_FMTBIT_S8 | \ SNDRV_PCM_FMTBIT_S16_LE | \ - SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .ops = &tegra210_adx_out_dai_ops, \ |