From: Samuel Holland <samuel@sholland.org>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Vasily Khoruzhick <anarsoul@gmail.com>,
Luca Weiss <luca@z3ntu.xyz>
Cc: alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Samuel Holland <samuel@sholland.org>
Subject: [PATCH 2/8] ASoC: sun50i-codec-analog: Gate the amplifier clock during suspend
Date: Sun, 16 Feb 2020 20:18:07 -0600 [thread overview]
Message-ID: <20200217021813.53266-3-samuel@sholland.org> (raw)
In-Reply-To: <20200217021813.53266-1-samuel@sholland.org>
The clock must be running for the zero-crossing mute functionality.
However, it must be gated for VDD-SYS to be turned off during system
suspend. Disable it in the suspend callback, after everything has
already been muted, to avoid pops when muting/unmuting outputs.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
sound/soc/sunxi/sun50i-codec-analog.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c
index cbdb31c3b7bd..4ad262c2e59b 100644
--- a/sound/soc/sunxi/sun50i-codec-analog.c
+++ b/sound/soc/sunxi/sun50i-codec-analog.c
@@ -438,6 +438,19 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = {
{ "EARPIECE", NULL, "Earpiece Amp" },
};
+static int sun50i_a64_codec_suspend(struct snd_soc_component *component)
+{
+ return regmap_update_bits(component->regmap, SUN50I_ADDA_HP_CTRL,
+ BIT(SUN50I_ADDA_HP_CTRL_PA_CLK_GATE),
+ BIT(SUN50I_ADDA_HP_CTRL_PA_CLK_GATE));
+}
+
+static int sun50i_a64_codec_resume(struct snd_soc_component *component)
+{
+ return regmap_update_bits(component->regmap, SUN50I_ADDA_HP_CTRL,
+ BIT(SUN50I_ADDA_HP_CTRL_PA_CLK_GATE), 0);
+}
+
static const struct snd_soc_component_driver sun50i_codec_analog_cmpnt_drv = {
.controls = sun50i_a64_codec_controls,
.num_controls = ARRAY_SIZE(sun50i_a64_codec_controls),
@@ -445,6 +458,8 @@ static const struct snd_soc_component_driver sun50i_codec_analog_cmpnt_drv = {
.num_dapm_widgets = ARRAY_SIZE(sun50i_a64_codec_widgets),
.dapm_routes = sun50i_a64_codec_routes,
.num_dapm_routes = ARRAY_SIZE(sun50i_a64_codec_routes),
+ .suspend = sun50i_a64_codec_suspend,
+ .resume = sun50i_a64_codec_resume,
};
static const struct of_device_id sun50i_codec_analog_of_match[] = {
--
2.24.1
next prev parent reply other threads:[~2020-02-17 2:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 2:18 [PATCH 0/8] ASoC: sun50i-codec-analog: Cleanup and power management Samuel Holland
2020-02-17 2:18 ` [PATCH 1/8] ASoC: sun50i-codec-analog: Fix duplicate use of ADC enable bits Samuel Holland
2020-02-17 3:28 ` Chen-Yu Tsai
2020-02-17 2:18 ` Samuel Holland [this message]
2020-02-17 3:29 ` [PATCH 2/8] ASoC: sun50i-codec-analog: Gate the amplifier clock during suspend Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 3/8] ASoC: sun50i-codec-analog: Group and sort mixer routes Samuel Holland
2020-02-17 3:32 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 4/8] ASoC: sun50i-codec-analog: Make headphone routes stereo Samuel Holland
2020-02-17 3:48 ` Chen-Yu Tsai
2020-02-17 3:57 ` Samuel Holland
2020-02-17 6:56 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 5/8] ASoC: sun50i-codec-analog: Enable DAPM for headphone switch Samuel Holland
2020-02-17 7:17 ` Chen-Yu Tsai
2020-02-23 3:54 ` Samuel Holland
2020-02-17 2:18 ` [PATCH 6/8] ASoC: sun50i-codec-analog: Make line out routes stereo Samuel Holland
2020-02-17 7:19 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 7/8] ASoC: sun50i-codec-analog: Enable DAPM for line out switch Samuel Holland
2020-02-17 7:20 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 8/8] ASoC: sun50i-codec-analog: Enable DAPM for earpiece switch Samuel Holland
2020-02-17 7:33 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200217021813.53266-3-samuel@sholland.org \
--to=samuel@sholland.org \
--cc=alsa-devel@alsa-project.org \
--cc=anarsoul@gmail.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luca@z3ntu.xyz \
--cc=mripard@kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®