diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-05-08 16:48:45 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-05-08 16:48:48 +0300 |
| commit | d09fc0c4bdfbcbe251df247b5a94e2a07dec9c2f (patch) | |
| tree | 893d98100d3ede2ff76905a67e1b9798c8c88868 /sound/soc/sunxi | |
| parent | 76cc3bd0c342199b0bc0fd6afc7035274bf7a718 (diff) | |
| parent | 274ede3e1a5fb3d0fd33acafb08993e95972c51f (diff) | |
| download | linux-dev-5.0.tar.xz | |
Merge tag 'v5.0.14' into dev-5.0dev-5.0
This is the 5.0.14 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'sound/soc/sunxi')
| -rw-r--r-- | sound/soc/sunxi/sun50i-codec-analog.c | 4 |
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 */ |