All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas Tanure <tanureal@opensource.cirrus.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: <alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Lucas Tanure <tanureal@opensource.cirrus.com>
Subject: [PATCH v2 12/20] hda: cs35l41: Mute the device before shutdown
Date: Fri, 4 Mar 2022 15:07:13 +0000	[thread overview]
Message-ID: <20220304150721.3802-13-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20220304150721.3802-1-tanureal@opensource.cirrus.com>

Mute the device before shutdown to avoid pops
and clicks all types of boost.

Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
 sound/pci/hda/cs35l41_hda.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 3b9515ed871d..b3cc7db3fc42 100644
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -28,6 +28,11 @@ static const struct reg_sequence cs35l41_hda_config[] = {
 	{ CS35L41_PWR_CTRL2,		0x00000001 }, // AMP_EN = 1
 };
 
+static const struct reg_sequence cs35l41_hda_mute[] = {
+	{ CS35L41_AMP_GAIN_CTRL,	0x00000000 }, // AMP_GAIN_PCM 0.5 dB
+	{ CS35L41_AMP_DIG_VOL_CTRL,	0x0000A678 }, // AMP_VOL_PCM Mute
+};
+
 static const struct reg_sequence cs35l41_hda_start_bst[] = {
 	{ CS35L41_PWR_CTRL2,		0x00000021 }, // BST_EN = 10, AMP_EN = 1
 	{ CS35L41_PWR_CTRL1,		0x00000001, 3000}, // set GLOBAL_EN = 1
@@ -89,7 +94,6 @@ static const struct reg_sequence cs35l41_active_to_safe[] = {
 	{ 0x00000040,			0x00000055 },
 	{ 0x00000040,			0x000000AA },
 	{ 0x00007438,			0x00585941 },
-	{ CS35L41_AMP_DIG_VOL_CTRL,	0x0000A678 }, // AMP_VOL_PCM Mute
 	{ CS35L41_PWR_CTRL2,		0x00000000 }, // AMP_EN = 0
 	{ CS35L41_PWR_CTRL1,		0x00000000 },
 	{ 0x0000742C,			0x00000009, 2000 },
@@ -146,6 +150,7 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
 			ret = regmap_multi_reg_write(reg, reg_seq->prepare, reg_seq->num_prepare);
 		break;
 	case HDA_GEN_PCM_ACT_CLEANUP:
+		regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute));
 		if (reg_seq->cleanup)
 			ret = regmap_multi_reg_write(reg, reg_seq->cleanup, reg_seq->num_cleanup);
 		break;
-- 
2.35.1


WARNING: multiple messages have this Message-ID (diff)
From: Lucas Tanure <tanureal@opensource.cirrus.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org,
	linux-kernel@vger.kernel.org,
	Lucas Tanure <tanureal@opensource.cirrus.com>,
	devicetree@vger.kernel.org
Subject: [PATCH v2 12/20] hda: cs35l41: Mute the device before shutdown
Date: Fri, 4 Mar 2022 15:07:13 +0000	[thread overview]
Message-ID: <20220304150721.3802-13-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20220304150721.3802-1-tanureal@opensource.cirrus.com>

Mute the device before shutdown to avoid pops
and clicks all types of boost.

Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
 sound/pci/hda/cs35l41_hda.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 3b9515ed871d..b3cc7db3fc42 100644
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -28,6 +28,11 @@ static const struct reg_sequence cs35l41_hda_config[] = {
 	{ CS35L41_PWR_CTRL2,		0x00000001 }, // AMP_EN = 1
 };
 
+static const struct reg_sequence cs35l41_hda_mute[] = {
+	{ CS35L41_AMP_GAIN_CTRL,	0x00000000 }, // AMP_GAIN_PCM 0.5 dB
+	{ CS35L41_AMP_DIG_VOL_CTRL,	0x0000A678 }, // AMP_VOL_PCM Mute
+};
+
 static const struct reg_sequence cs35l41_hda_start_bst[] = {
 	{ CS35L41_PWR_CTRL2,		0x00000021 }, // BST_EN = 10, AMP_EN = 1
 	{ CS35L41_PWR_CTRL1,		0x00000001, 3000}, // set GLOBAL_EN = 1
@@ -89,7 +94,6 @@ static const struct reg_sequence cs35l41_active_to_safe[] = {
 	{ 0x00000040,			0x00000055 },
 	{ 0x00000040,			0x000000AA },
 	{ 0x00007438,			0x00585941 },
-	{ CS35L41_AMP_DIG_VOL_CTRL,	0x0000A678 }, // AMP_VOL_PCM Mute
 	{ CS35L41_PWR_CTRL2,		0x00000000 }, // AMP_EN = 0
 	{ CS35L41_PWR_CTRL1,		0x00000000 },
 	{ 0x0000742C,			0x00000009, 2000 },
@@ -146,6 +150,7 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
 			ret = regmap_multi_reg_write(reg, reg_seq->prepare, reg_seq->num_prepare);
 		break;
 	case HDA_GEN_PCM_ACT_CLEANUP:
+		regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute));
 		if (reg_seq->cleanup)
 			ret = regmap_multi_reg_write(reg, reg_seq->cleanup, reg_seq->num_cleanup);
 		break;
-- 
2.35.1


  parent reply	other threads:[~2022-03-04 15:09 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-04 15:07 [PATCH v2 00/20] Support external boost at CS35l41 ASoC driver Lucas Tanure
2022-03-04 15:07 ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 01/20] ASoC: cs35l41: Fix GPIO2 configuration Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:22   ` Charles Keepax
2022-03-04 15:22     ` Charles Keepax
2022-03-04 15:44     ` tanureal
2022-03-04 15:07 ` [PATCH v2 02/20] ASoC: cs35l41: Fix max number of TX channels Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 03/20] ASoC: cs35l41: Fix DSP mbox start command and global enable order Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 04/20] ASoC: cs35l41: Remove unnecessary param Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 05/20] sound: cs35l41: Unify hardware configuration Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 06/20] sound: cs35l41: Check hw_config before using it Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 07/20] sound: cs35l41: Move cs35l41_gpio_config to shared lib Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 08/20] hda: cs35l41: Fix I2S params comments Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 09/20] hda: cs35l41: Always configure the DAI Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 10/20] hda: cs35l41: Add Boost type flag Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 11/20] hda: cs35l41: Put the device into safe mode for external boost Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` Lucas Tanure [this message]
2022-03-04 15:07   ` [PATCH v2 12/20] hda: cs35l41: Mute the device before shutdown Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 13/20] sound: cs35l41: Enable Internal Boost in shared lib Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 16:17   ` Charles Keepax
2022-03-04 16:17     ` Charles Keepax
2022-03-04 15:07 ` [PATCH v2 14/20] hda: cs35l41: Move boost config to initialization code Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 15/20] hda: cs35l41: Remove cs35l41_hda_reg_sequence struct Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 16/20] hda: cs35l41: Reorganize log for playback actions Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 17/20] hda: cs35l41: Handle all external boost setups the same way Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 18/20] hda: cs35l41: Move external boost handling to lib for ASoC use Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 19/20] ASoC: cs35l41: Support external boost Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 15:07 ` [PATCH v2 20/20] ASoC: cs35l41: Document CS35l41 External Boost Lucas Tanure
2022-03-04 15:07   ` Lucas Tanure
2022-03-04 17:05 ` [PATCH v2 00/20] Support external boost at CS35l41 ASoC driver Takashi Iwai
2022-03-04 17:05   ` Takashi Iwai
2022-03-07 20:38 ` (subset) " Mark Brown
2022-03-07 20:38   ` Mark Brown

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=20220304150721.3802-13-tanureal@opensource.cirrus.com \
    --to=tanureal@opensource.cirrus.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=patches@opensource.cirrus.com \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --cc=tiwai@suse.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.