lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 066/352] ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit ca0412a05756cd0b94751ca4d54fe6522f00b1f4 ]

    On the Allwinner A64 SoCs, the audio codec has a built-in headphone
    amplifier. This amplifier has a power supply separate from the rest of
    the analog audio circuitry, labeled cpvdd.

    This patch adds a DAPM widget for this supply, and ties it to the
    headphone amp widget.

    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sunxi/sun50i-codec-analog.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c
    index 8f5f999df631..df1fed0aa001 100644
    --- a/sound/soc/sunxi/sun50i-codec-analog.c
    +++ b/sound/soc/sunxi/sun50i-codec-analog.c
    @@ -274,6 +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_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,
    @@ -361,6 +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" },
    { "HP", NULL, "Headphone Amp" },

    /* Microphone Routes */
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 17:12    [W:4.137 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site