Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d23dd9c authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/rt5677' of... 

Merge branch 'fix/rt5677' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-w-codec
parents a7834aa9 bdfbf255

sound/soc/codecs/rt5677.c

+14 −4
Original line number Diff line number Diff line
@@ -2178,10 +2178,14 @@ static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w, 
	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_PRE_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x2);

		break;



	case SND_SOC_DAPM_POST_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x0);

		break;



	default:

		return 0;

	}
@@ -2196,10 +2200,14 @@ static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w, 
	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_PRE_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x2);

		break;



	case SND_SOC_DAPM_POST_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x0);

		break;



	default:

		return 0;

	}
@@ -2307,9 +2315,11 @@ static int rt5677_vref_event(struct snd_soc_dapm_widget *w, 


static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {

	SND_SOC_DAPM_SUPPLY("PLL1", RT5677_PWR_ANLG2, RT5677_PWR_PLL1_BIT,

		0, rt5677_set_pll1_event, SND_SOC_DAPM_POST_PMU),

		0, rt5677_set_pll1_event, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("PLL2", RT5677_PWR_ANLG2, RT5677_PWR_PLL2_BIT,

		0, rt5677_set_pll2_event, SND_SOC_DAPM_POST_PMU),

		0, rt5677_set_pll2_event, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU),



	/* ASRC */

	SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5677_ASRC_1, 0, 0, NULL, 0),