ASoC: rt5640: move DAC2 Power to rt5640_dapm_widgets
Subsystems (3)
PATCH 1/1 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.
--- sound/soc/codecs/rt5640.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt5640.c +4 -4
@@ -1227,6 +1227,10 @@ static int rt5640_hp_post_event(struct snd_soc_dapm_widget *w, 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 int rt5640_hp_post_event(struct snd_soc_dapm_widget *w, 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"),
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainerApplied "ASoC: rt5640: move DAC2 Power to rt5640_dapm_widgets" to the asoc tree
The patch
ASoC: rt5640: move DAC2 Power to rt5640_dapm_widgets
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
80317c2cb40085a3dcf80015bc39fbac40e2092aMon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Wed, 4 Jan 2017 13:14:12 +0800
Subject: [PATCH] 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.
--- sound/soc/codecs/rt5640.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt5640.c +4 -4
@@ -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"),
Signature · 1 line
2.11.0