blob: 88e6fce3c1f02193131a88117da4b11bf7947526 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 8ecd0e38be0422967e5323f5f276466e9d206d32 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 18 Nov 2018 15:32:28 +0100
Subject: [PATCH 212/773] rpi-wm8804-soundcard: configure wm8804 clocks only on
rate change
This should avoid clicks when stopping and immediately afterwards
starting a stream with the same samplerate as before.
Signed-off-by: Matthias Reichl <hias@horus.com>
---
sound/soc/bcm/rpi-wm8804-soundcard.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- a/sound/soc/bcm/rpi-wm8804-soundcard.c
+++ b/sound/soc/bcm/rpi-wm8804-soundcard.c
@@ -64,6 +64,7 @@ struct snd_rpi_wm8804_drvdata {
static struct gpio_desc *snd_clk44gpio;
static struct gpio_desc *snd_clk48gpio;
+static int wm8804_samplerate = 0;
#define CLK_44EN_RATE 22579200UL
#define CLK_48EN_RATE 24576000UL
@@ -117,6 +118,12 @@ static int snd_rpi_wm8804_hw_params(stru
struct wm8804_clk_cfg clk_cfg;
int samplerate = params_rate(params);
+ if (samplerate == wm8804_samplerate)
+ return 0;
+
+ /* clear until all clocks are setup properly */
+ wm8804_samplerate = 0;
+
snd_rpi_wm8804_clk_cfg(samplerate, &clk_cfg);
pr_debug("%s samplerate: %d mclk_freq: %u mclk_div: %u sysclk: %u\n",
@@ -163,6 +170,8 @@ static int snd_rpi_wm8804_hw_params(stru
return ret;
}
+ wm8804_samplerate = samplerate;
+
/* set sampling frequency status bits */
snd_soc_component_update_bits(component, WM8804_SPDTX4, 0x0f,
sampling_freq);
|
