summaryrefslogtreecommitdiff
path: root/sound/soc/sunxi/sun50i-codec-analog.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-02-26 16:22:47 +0000
committerMark Brown <broonie@kernel.org>2019-02-26 16:22:47 +0000
commit3146089d235b304e665dc551472ae9cb9ab58572 (patch)
treed1a9141c302f269cb8468f0d4de78124ea5e389a /sound/soc/sunxi/sun50i-codec-analog.c
parentb5e806ae4ad81de66c334d3d333fa42f960fbbd1 (diff)
parent7b6b0049e2b70d103adf1b7d0320802f70ddceca (diff)
Merge branch 'asoc-5.1' into asoc-next
Diffstat (limited to 'sound/soc/sunxi/sun50i-codec-analog.c')
-rw-r--r--sound/soc/sunxi/sun50i-codec-analog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c
index df1fed0aa001..d105c90c3706 100644
--- a/sound/soc/sunxi/sun50i-codec-analog.c
+++ b/sound/soc/sunxi/sun50i-codec-analog.c
@@ -274,7 +274,7 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = {
* stream widgets at the card level.
*/
- SND_SOC_DAPM_REGULATOR_SUPPLY("hpvcc", 0, 0),
+ SND_SOC_DAPM_REGULATOR_SUPPLY("cpvdd", 0, 0),
SND_SOC_DAPM_MUX("Headphone Source Playback Route",
SND_SOC_NOPM, 0, 0, sun50i_codec_hp_src),
SND_SOC_DAPM_OUT_DRV("Headphone Amp", SUN50I_ADDA_HP_CTRL,
@@ -362,7 +362,7 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = {
{ "Headphone Source Playback Route", "Mixer", "Left Mixer" },
{ "Headphone Source Playback Route", "Mixer", "Right Mixer" },
{ "Headphone Amp", NULL, "Headphone Source Playback Route" },
- { "Headphone Amp", NULL, "hpvcc" },
+ { "Headphone Amp", NULL, "cpvdd" },
{ "HP", NULL, "Headphone Amp" },
/* Microphone Routes */