]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: wm8962: Enable oscillator if selecting WM8962_FLL_OSC
authorStuart Henderson <stuarth@opensource.cirrus.com>
Wed, 6 Mar 2024 16:14:35 +0000 (16:14 +0000)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:47 +0000 (18:21 -0400)
[ Upstream commit 03c7874106ca5032a312626b927b1c35f07b1f35 ]

Signed-off-by: Stuart Henderson <stuarth@opensource.cirrus.com>
Link: https://msgid.link/r/20240306161439.1385643-1-stuarth@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/wm8962.c

index 57aeded978c283eefdfffc4d295378fbf3a27667..d6efc85f966b07ccc3bb1059df405b91d21130ca 100644 (file)
@@ -2898,8 +2898,12 @@ static int wm8962_set_fll(struct snd_soc_component *component, int fll_id, int s
        switch (fll_id) {
        case WM8962_FLL_MCLK:
        case WM8962_FLL_BCLK:
+               fll1 |= (fll_id - 1) << WM8962_FLL_REFCLK_SRC_SHIFT;
+               break;
        case WM8962_FLL_OSC:
                fll1 |= (fll_id - 1) << WM8962_FLL_REFCLK_SRC_SHIFT;
+               snd_soc_component_update_bits(component, WM8962_PLL2,
+                                             WM8962_OSC_ENA, WM8962_OSC_ENA);
                break;
        case WM8962_FLL_INT:
                snd_soc_component_update_bits(component, WM8962_FLL_CONTROL_1,