From 8ad72ad298f4f48649a357494685441c4cd59d0a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 18 Nov 2018 15:32:28 +0100 Subject: [PATCH 212/432] 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 --- sound/soc/bcm/rpi-wm8804-soundcard.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/bcm/rpi-wm8804-soundcard.c b/sound/soc/bcm/rpi-wm8804-soundcard.c index ad42f5d35067..c1bed91e2cda 100644 --- 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(struct snd_pcm_substream *substream, 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(struct snd_pcm_substream *substream, return ret; } + wm8804_samplerate = samplerate; + /* set sampling frequency status bits */ snd_soc_component_update_bits(component, WM8804_SPDTX4, 0x0f, sampling_freq); -- 2.19.1