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 11/20] hda: cs35l41: Put the device into safe mode for external boost Date: Fri, 4 Mar 2022 15:07:12 +0000 [thread overview] Message-ID: <20220304150721.3802-12-tanureal@opensource.cirrus.com> (raw) In-Reply-To: <20220304150721.3802-1-tanureal@opensource.cirrus.com> All external boost setups should be put into safe mode. Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com> --- sound/pci/hda/cs35l41_hda.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index 17660ce71f93..3b9515ed871d 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -109,8 +109,6 @@ static const struct reg_sequence cs35l41_reset_to_safe[] = { }; static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_no_bst = { - .probe = cs35l41_reset_to_safe, - .num_probe = ARRAY_SIZE(cs35l41_reset_to_safe), .prepare = cs35l41_safe_to_active, .num_prepare = ARRAY_SIZE(cs35l41_safe_to_active), .cleanup = cs35l41_active_to_safe, @@ -224,10 +222,15 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41) return ret; break; case CS35L41_EXT_BOOST: - cs35l41->reg_seq = &cs35l41_hda_reg_seq_ext_bst; - break; case CS35L41_EXT_BOOST_NO_VSPK_SWITCH: - cs35l41->reg_seq = &cs35l41_hda_reg_seq_no_bst; + if (hw_cfg->bst_type == CS35L41_EXT_BOOST) + cs35l41->reg_seq = &cs35l41_hda_reg_seq_ext_bst; + else + cs35l41->reg_seq = &cs35l41_hda_reg_seq_no_bst; + ret = regmap_multi_reg_write(cs35l41->regmap, cs35l41_reset_to_safe, + ARRAY_SIZE(cs35l41_reset_to_safe)); + if (ret) + return ret; break; default: dev_err(cs35l41->dev, "Boost type %d not supported\n", hw_cfg->bst_type); -- 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 11/20] hda: cs35l41: Put the device into safe mode for external boost Date: Fri, 4 Mar 2022 15:07:12 +0000 [thread overview] Message-ID: <20220304150721.3802-12-tanureal@opensource.cirrus.com> (raw) In-Reply-To: <20220304150721.3802-1-tanureal@opensource.cirrus.com> All external boost setups should be put into safe mode. Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com> --- sound/pci/hda/cs35l41_hda.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index 17660ce71f93..3b9515ed871d 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -109,8 +109,6 @@ static const struct reg_sequence cs35l41_reset_to_safe[] = { }; static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_no_bst = { - .probe = cs35l41_reset_to_safe, - .num_probe = ARRAY_SIZE(cs35l41_reset_to_safe), .prepare = cs35l41_safe_to_active, .num_prepare = ARRAY_SIZE(cs35l41_safe_to_active), .cleanup = cs35l41_active_to_safe, @@ -224,10 +222,15 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41) return ret; break; case CS35L41_EXT_BOOST: - cs35l41->reg_seq = &cs35l41_hda_reg_seq_ext_bst; - break; case CS35L41_EXT_BOOST_NO_VSPK_SWITCH: - cs35l41->reg_seq = &cs35l41_hda_reg_seq_no_bst; + if (hw_cfg->bst_type == CS35L41_EXT_BOOST) + cs35l41->reg_seq = &cs35l41_hda_reg_seq_ext_bst; + else + cs35l41->reg_seq = &cs35l41_hda_reg_seq_no_bst; + ret = regmap_multi_reg_write(cs35l41->regmap, cs35l41_reset_to_safe, + ARRAY_SIZE(cs35l41_reset_to_safe)); + if (ret) + return ret; break; default: dev_err(cs35l41->dev, "Boost type %d not supported\n", hw_cfg->bst_type); -- 2.35.1
next prev parent reply other threads:[~2022-03-04 15:08 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 ` Lucas Tanure [this message] 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 ` [PATCH v2 12/20] hda: cs35l41: Mute the device before shutdown Lucas Tanure 2022-03-04 15:07 ` 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-12-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: linkBe 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.