ASoC: sunxi: sun50i-codec-analog: Rename hpvcc regulator supply to cpvdd
authorChen-Yu Tsai <wens@csie.org>
Wed, 13 Feb 2019 07:04:56 +0000 (15:04 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 19 Feb 2019 15:36:02 +0000 (15:36 +0000)
The A64 datasheet lists the supply rail for the headphone amp's charge
pump as "CPVDD". cpvdd-supply is the name of the property for this power
rail specified in the device tree bindings. "HPVCC" was the name used in
the A33 datasheet for the same function.

Rename the supply so it matches the datasheet, bindings, and the subject
from the original commit.

Fixes: ca0412a05756 ("ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sunxi/sun50i-codec-analog.c

index df1fed0aa0019d90e787cdd18ddffaf7416991f3..d105c90c37069575a20fcb98f69209acce190500 100644 (file)
@@ -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 */