You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From f303194bc24925d3efd965ccfae40974ea437240 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Schambacher?=
|
|
<j-schambacher@users.noreply.github.com>
|
|
Date: Wed, 15 Apr 2020 11:48:29 +0200
|
|
Subject: [PATCH] Fixes a problem with clock settings of HiFiBerry
|
|
DAC+ADC PRO (#3545)
|
|
|
|
This patch fixes a problem of the re-calculation of
|
|
i2s-clock and -parameter settings when only the ADC is activated.
|
|
|
|
Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
|
|
---
|
|
sound/soc/bcm/hifiberry_dacplusadcpro.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
--- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
|
|
+++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
|
|
@@ -390,9 +390,11 @@ static int snd_rpi_hifiberry_dacplusadcp
|
|
int channels = params_channels(params);
|
|
int width = 32;
|
|
struct snd_soc_component *dac = rtd->codec_dais[0]->component;
|
|
+ struct snd_soc_dai *dai = rtd->codec_dais[0];
|
|
+ struct snd_soc_dai_driver *drv = dai->driver;
|
|
+ const struct snd_soc_dai_ops *ops = drv->ops;
|
|
|
|
if (snd_rpi_hifiberry_is_dacpro) {
|
|
-
|
|
width = snd_pcm_format_physical_width(params_format(params));
|
|
|
|
snd_rpi_hifiberry_dacplusadcpro_set_sclk(dac,
|
|
@@ -414,6 +416,11 @@ static int snd_rpi_hifiberry_dacplusadcp
|
|
return ret;
|
|
ret = snd_soc_dai_set_tdm_slot(rtd->codec_dais[1], 0x03, 0x03,
|
|
channels, width);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ if (snd_rpi_hifiberry_is_dacpro && ops->hw_params)
|
|
+ ret = ops->hw_params(substream, params, dai);
|
|
return ret;
|
|
}
|
|
|