From: Lucas Tanure <tanureal@opensource.cirrus.com> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.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 v7 07/16] ALSA: hda: cs35l41: Put the device into safe mode for external boost Date: Wed, 13 Apr 2022 09:37:19 +0100 [thread overview] Message-ID: <20220413083728.10730-8-tanureal@opensource.cirrus.com> (raw) In-Reply-To: <20220413083728.10730-1-tanureal@opensource.cirrus.com> To facilitate the configuration of external boost devices, put all devices, with or without VSPK switch, into safe mode from the start. That allows the following parts of the driver to handle all external boost devices in the same way. 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 0dac622805c4..46e920ec3000 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.2
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>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.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 v7 07/16] ALSA: hda: cs35l41: Put the device into safe mode for external boost Date: Wed, 13 Apr 2022 09:37:19 +0100 [thread overview] Message-ID: <20220413083728.10730-8-tanureal@opensource.cirrus.com> (raw) In-Reply-To: <20220413083728.10730-1-tanureal@opensource.cirrus.com> To facilitate the configuration of external boost devices, put all devices, with or without VSPK switch, into safe mode from the start. That allows the following parts of the driver to handle all external boost devices in the same way. 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 0dac622805c4..46e920ec3000 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.2
next prev parent reply other threads:[~2022-04-13 8:38 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-13 8:37 [PATCH v7 00/16] Support external boost at CS35l41 ASoC driver Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 01/16] ALSA: cs35l41: Unify hardware configuration Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 02/16] ALSA: cs35l41: Check hw_config before using it Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 03/16] ALSA: cs35l41: Move cs35l41_gpio_config to shared lib Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 04/16] ALSA: hda: cs35l41: Fix I2S params comments Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 05/16] ALSA: hda: cs35l41: Always configure the DAI Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 06/16] ALSA: hda: cs35l41: Add Boost type flag Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure [this message] 2022-04-13 8:37 ` [PATCH v7 07/16] ALSA: hda: cs35l41: Put the device into safe mode for external boost Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 08/16] ALSA: hda: cs35l41: Mute the device before shutdown Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 09/16] ALSA: cs35l41: Enable Internal Boost in shared lib Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 10/16] ALSA: hda: cs35l41: Move boost config to initialization code Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 11/16] ALSA: hda: cs35l41: Remove cs35l41_hda_reg_sequence struct Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 12/16] ALSA: hda: cs35l41: Reorganize log for playback actions Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 13/16] ALSA: hda: cs35l41: Handle all external boost setups the same way Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 14/16] ALSA: hda: cs35l41: Move external boost handling to lib for ASoC use Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 15/16] ASoC: cs35l41: Document CS35l41 External Boost Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:37 ` [PATCH v7 16/16] ASoC: cs35l41: Support external boost Lucas Tanure 2022-04-13 8:37 ` Lucas Tanure 2022-04-13 8:52 ` [PATCH v7 00/16] Support external boost at CS35l41 ASoC driver Takashi Iwai 2022-04-13 8:52 ` Takashi Iwai
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=20220413083728.10730-8-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=krzysztof.kozlowski+dt@linaro.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.