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

Commit 80317c2c authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: rt5640: move DAC2 Power to rt5640_dapm_widgets 



"DAC L2 Power" and "DAC R2 Power" are used by both rt5639 and rt5640.
But it was defined in rt5640_specific_dapm_widgets[]. Move them to
rt5640_dapm_widgets will let both rt5639 and rt5640 can use it.

Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

sound/soc/codecs/rt5640.c

+4 −4
Original line number Diff line number Diff line
@@ -1227,6 +1227,10 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { 
		RT5640_PWR_DAC_L1_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC R1 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_R1_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC L2 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_L2_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC R2 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_R2_BIT, 0, NULL, 0),

	/* SPK/OUT Mixer */

	SND_SOC_DAPM_MIXER("SPK MIXL", RT5640_PWR_MIXER, RT5640_PWR_SM_L_BIT,

		0, rt5640_spk_l_mix, ARRAY_SIZE(rt5640_spk_l_mix)),
@@ -1322,10 +1326,6 @@ static const struct snd_soc_dapm_widget rt5640_specific_dapm_widgets[] = { 
		rt5640_mono_mix, ARRAY_SIZE(rt5640_mono_mix)),

	SND_SOC_DAPM_SUPPLY("Improve MONO Amp Drv", RT5640_PWR_ANLG1,

		RT5640_PWR_MA_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC L2 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_L2_BIT, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("DAC R2 Power", RT5640_PWR_DIG1,

		RT5640_PWR_DAC_R2_BIT, 0, NULL, 0),



	SND_SOC_DAPM_OUTPUT("MONOP"),

	SND_SOC_DAPM_OUTPUT("MONON"),