| From 5fd812e6f5ae0376134234ceb70e8de541ccb10d Mon Sep 17 00:00:00 2001 |
| From: Chen-Yu Tsai <wens@csie.org> |
| Date: Wed, 13 Feb 2019 15:04:56 +0800 |
| Subject: ASoC: sunxi: sun50i-codec-analog: Rename hpvcc regulator supply to cpvdd |
| |
| From: Chen-Yu Tsai <wens@csie.org> |
| |
| commit 5fd812e6f5ae0376134234ceb70e8de541ccb10d upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/sunxi/sun50i-codec-analog.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
| * 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 s |
| { "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 */ |