Hifiberry DAC+ADC Pro fix for the PLL when changing sample rates

Adds 2 msecs delay when switching between oscillators to allow
correct PLL settling.
Thanks to Clive Messer for the support!

Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>

diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
index 4c03927..8b04d30 100644 (file)
--- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
+++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
@@ -190,6 +190,7 @@ static void snd_rpi_hifiberry_dacplusadcpro_select_clk(
                                PCM512x_GPIO_CONTROL_1, 0x24, 0x04);
                break;
        }
+       usleep_range(2000, 2100);
 }
 
 static void snd_rpi_hifiberry_dacplusadcpro_clk_gpio(struct snd_soc_component *component)
@@ -207,13 +208,6 @@ static bool snd_rpi_hifiberry_dacplusadcpro_is_sclk(struct snd_soc_component *co
        return (!(sck & 0x40));
 }
 
-static bool snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep(
-       struct snd_soc_component *component)
-{
-       msleep(2);
-       return snd_rpi_hifiberry_dacplusadcpro_is_sclk(component);
-}
-
 static bool snd_rpi_hifiberry_dacplusadcpro_is_pro_card(struct snd_soc_component *component)
 {
        bool isClk44EN, isClk48En, isNoClk;
@@ -221,13 +215,13 @@ static bool snd_rpi_hifiberry_dacplusadcpro_is_pro_card(struct snd_soc_component
        snd_rpi_hifiberry_dacplusadcpro_clk_gpio(component);
 
        snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_CLK44EN);
-       isClk44EN = snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep(component);
+       isClk44EN = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component);
 
        snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_NOCLOCK);
-       isNoClk = snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep(component);
+       isNoClk = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component);
 
        snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_CLK48EN);
-       isClk48En = snd_rpi_hifiberry_dacplusadcpro_is_sclk_sleep(component);
+       isClk48En = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component);
 
        return (isClk44EN && isClk48En && !isNoClk);
 }