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 10/20] hda: cs35l41: Add Boost type flag
Date: Thu, 3 Mar 2022 17:30:49 +0000 [thread overview]
Message-ID: <20220303173059.269657-11-tanureal@opensource.cirrus.com> (raw)
In-Reply-To: <20220303173059.269657-1-tanureal@opensource.cirrus.com>
Replace vspk_always_on by a enum that better
characterizes the system, as there is 3 types
of boost hardware.
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
include/sound/cs35l41.h | 9 ++++++--
sound/pci/hda/cs35l41_hda.c | 43 +++++++++++++++++++++----------------
2 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/include/sound/cs35l41.h b/include/sound/cs35l41.h
index e3ec0f422fff..fbf38f32e36d 100644
--- a/include/sound/cs35l41.h
+++ b/include/sound/cs35l41.h
@@ -725,6 +725,12 @@
#define CS35L41_SPI_MAX_FREQ 4000000
#define CS35L41_REGSTRIDE 4
+enum cs35l41_boost_type {
+ CS35L41_INT_BOOST,
+ CS35L41_EXT_BOOST,
+ CS35L41_EXT_BOOST_NO_VSPK_SWITCH,
+};
+
enum cs35l41_clk_ids {
CS35L41_CLKID_SCLK = 0,
CS35L41_CLKID_LRCLK = 1,
@@ -762,8 +768,7 @@ struct cs35l41_hw_cfg {
struct cs35l41_gpio_cfg gpio2;
unsigned int spk_pos;
- /* Don't put the AMP in reset if VSPK can not be turned off */
- bool vspk_always_on;
+ enum cs35l41_boost_type bst_type;
};
struct cs35l41_otp_packed_element_t {
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 4c99dcac2dd7..17660ce71f93 100644
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -210,20 +210,30 @@ static const struct component_ops cs35l41_hda_comp_ops = {
static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)
{
struct cs35l41_hw_cfg *hw_cfg = &cs35l41->hw_cfg;
- bool internal_boost = false;
int ret;
if (!cs35l41->hw_cfg.valid)
return -EINVAL;
- if (hw_cfg->vspk_always_on) {
+ switch (hw_cfg->bst_type) {
+ case CS35L41_INT_BOOST:
+ cs35l41->reg_seq = &cs35l41_hda_reg_seq_int_bst;
+ ret = cs35l41_boost_config(cs35l41->dev, cs35l41->regmap,
+ hw_cfg->bst_ind, hw_cfg->bst_cap, hw_cfg->bst_ipk);
+ if (ret)
+ 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;
- return 0;
+ break;
+ default:
+ dev_err(cs35l41->dev, "Boost type %d not supported\n", hw_cfg->bst_type);
+ return -EINVAL;
}
- if (hw_cfg->bst_ind > 0 || hw_cfg->bst_cap > 0 || hw_cfg->bst_ipk > 0)
- internal_boost = true;
-
if (hw_cfg->gpio1.valid) {
switch (hw_cfg->gpio1.func) {
case CS35L41_NOT_USED:
@@ -256,16 +266,6 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)
cs35l41_gpio_config(cs35l41->regmap, hw_cfg);
- if (internal_boost) {
- cs35l41->reg_seq = &cs35l41_hda_reg_seq_int_bst;
- ret = cs35l41_boost_config(cs35l41->dev, cs35l41->regmap,
- hw_cfg->bst_ind, hw_cfg->bst_cap, hw_cfg->bst_ipk);
- if (ret)
- return ret;
- } else {
- cs35l41->reg_seq = &cs35l41_hda_reg_seq_ext_bst;
- }
-
return cs35l41_hda_channel_map(cs35l41->dev, 0, NULL, 1, &hw_cfg->spk_pos);
}
@@ -363,6 +363,11 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i
else
hw_cfg->bst_cap = -1;
+ if (hw_cfg->bst_ind > 0 || hw_cfg->bst_cap > 0 || hw_cfg->bst_ipk > 0)
+ hw_cfg->bst_type = CS35L41_INT_BOOST;
+ else
+ hw_cfg->bst_type = CS35L41_EXT_BOOST;
+
hw_cfg->valid = true;
put_device(physdev);
@@ -388,7 +393,7 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i
/* check I2C address to assign the index */
cs35l41->index = id == 0x40 ? 0 : 1;
cs35l41->reset_gpio = gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH);
- cs35l41->hw_cfg.vspk_always_on = true;
+ cs35l41->hw_cfg.bst_type = CS35L41_EXT_BOOST_NO_VSPK_SWITCH;
cs35l41->hw_cfg.valid = true;
put_device(physdev);
@@ -515,7 +520,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
return 0;
err:
- if (!cs35l41->hw_cfg.vspk_always_on)
+ if (cs35l41->hw_cfg.bst_type != CS35L41_EXT_BOOST_NO_VSPK_SWITCH)
gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
gpiod_put(cs35l41->reset_gpio);
@@ -529,7 +534,7 @@ void cs35l41_hda_remove(struct device *dev)
component_del(cs35l41->dev, &cs35l41_hda_comp_ops);
- if (!cs35l41->hw_cfg.vspk_always_on)
+ if (cs35l41->hw_cfg.bst_type != CS35L41_EXT_BOOST_NO_VSPK_SWITCH)
gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
gpiod_put(cs35l41->reset_gpio);
}
--
2.35.1
next prev parent reply other threads:[~2022-03-03 17:32 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 17:30 [PATCH 00/20] Support external boost at CS35l41 ASoC driver Lucas Tanure
2022-03-03 17:30 ` [PATCH 01/20] ASoC: cs35l41: Fix GPIO2 configuration Lucas Tanure
2022-03-04 10:01 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 02/20] ASoC: cs35l41: Fix max number of TX channels Lucas Tanure
2022-03-04 10:02 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 03/20] ASoC: cs35l41: Fix DSP mbox start command and global enable order Lucas Tanure
2022-03-04 10:02 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 04/20] ASoC: cs35l41: Remove unnecessary param Lucas Tanure
2022-03-04 10:02 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 05/20] sound: cs35l41: Unify hardware configuration Lucas Tanure
2022-03-04 10:15 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 06/20] sound: cs35l41: Check hw_config before using it Lucas Tanure
2022-03-04 10:17 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 07/20] sound: cs35l41: Move cs35l41_gpio_config to shared lib Lucas Tanure
2022-03-04 10:18 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 08/20] hda: cs35l41: Fix I2S params comments Lucas Tanure
2022-03-03 17:30 ` [PATCH 09/20] hda: cs35l41: Always configure the DAI Lucas Tanure
2022-03-03 17:30 ` Lucas Tanure [this message]
2022-03-03 17:30 ` [PATCH 11/20] hda: cs35l41: Put the device into safe mode for external boost Lucas Tanure
2022-03-03 17:30 ` [PATCH 12/20] hda: cs35l41: Mute the device before shutdown Lucas Tanure
2022-03-03 17:30 ` [PATCH 13/20] sound: cs35l41: Enable Internal Boost in shared lib Lucas Tanure
2022-03-04 10:19 ` Charles Keepax
2022-03-03 17:30 ` [PATCH 14/20] hda: cs35l41: Move boost config to initialization code Lucas Tanure
2022-03-03 17:30 ` [PATCH 15/20] hda: cs35l41: Remove unnecessary log Lucas Tanure
2022-03-03 17:50 ` Mark Brown
2022-03-04 15:05 ` Lucas tanure
2022-03-03 17:30 ` [PATCH 16/20] hda: cs35l41: Remove cs35l41_hda_reg_sequence struct Lucas Tanure
2022-03-03 17:30 ` [PATCH 17/20] hda: cs35l41: Handle all external boost setups the same way Lucas Tanure
2022-03-03 17:30 ` [PATCH 18/20] hda: cs35l41: Move external boost handling to lib for ASoC use Lucas Tanure
2022-03-03 17:30 ` [PATCH 19/20] ASoC: cs35l41: Support external boost Lucas Tanure
2022-03-03 17:30 ` [PATCH 20/20] Documentation: devicetree: CS35l41 External Boost Lucas Tanure
2022-03-03 18:24 ` Mark Brown
2022-03-03 19:00 ` Rob Herring
2022-03-07 20:38 ` (subset) [PATCH 00/20] Support external boost at CS35l41 ASoC driver 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=20220303173059.269657-11-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).