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

Unverified Commit 5fd812e6 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Mark Brown
Browse files

ASoC: sunxi: sun50i-codec-analog: Rename hpvcc regulator supply to cpvdd 



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: ca0412a0 ("ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply")
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 65d257ee

sound/soc/sunxi/sun50i-codec-analog.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */