Support external boost at CS35l41 ASoC driver
Subsystems (4)
v2 cover Support external boost at CS35l41 ASoC driver
Move the support for CS35L41 external boost to its shared library for ASoC use.
This move resulted in cs35l41_hda_reg_sequence being removed, and its steps were broken down into regmap writes or functions from the library. And hardware configuration struct was unified for its use in the shared lib.
While at it, some minor bugs were found and fixed it.
v2 changelog:
- Instead of removing the log, playback actions will log the last regmap access.
- Documentation patch with the correct subject line and fixed bug reported by Rob Herring on the provided example.
Previous versions:
v1: https://lkml.org/lkml/2022/3/3/759
David Rhodes (2):
ASoC: cs35l41: Fix GPIO2 configuration
ASoC: cs35l41: Document CS35l41 External Boost
Lucas Tanure (18):
ASoC: cs35l41: Fix max number of TX channels
ASoC: cs35l41: Fix DSP mbox start command and global enable order
ASoC: cs35l41: Remove unnecessary param
sound: cs35l41: Unify hardware configuration
sound: cs35l41: Check hw_config before using it
sound: cs35l41: Move cs35l41_gpio_config to shared lib
hda: cs35l41: Fix I2S params comments
hda: cs35l41: Always configure the DAI
hda: cs35l41: Add Boost type flag
hda: cs35l41: Put the device into safe mode for external boost
hda: cs35l41: Mute the device before shutdown
sound: cs35l41: Enable Internal Boost in shared lib
hda: cs35l41: Move boost config to initialization code
hda: cs35l41: Remove cs35l41_hda_reg_sequence struct
hda: cs35l41: Reorganize log for playback actions
hda: cs35l41: Handle all external boost setups the same way
hda: cs35l41: Move external boost handling to lib for ASoC use
ASoC: cs35l41: Support external boost
.../bindings/sound/cirrus,cs35l41.yaml | 44 ++- include/sound/cs35l41.h | 53 +++- sound/pci/hda/cs35l41_hda.c | 295 ++++++------------ sound/pci/hda/cs35l41_hda.h | 27 +- sound/soc/codecs/cs35l41-i2c.c | 4 +- sound/soc/codecs/cs35l41-lib.c | 190 ++++++++++- sound/soc/codecs/cs35l41-spi.c | 4 +- sound/soc/codecs/cs35l41.c | 174 +++++------ sound/soc/codecs/cs35l41.h | 5 +- 9 files changed, 440 insertions(+), 356 deletions(-)
Signature · 1 line
2.35.1
PATCH v2 1/20 ASoC: cs35l41: Fix GPIO2 configuration
From: David Rhodes <[email protected]>
Fix GPIO2 polarity and direction configuration
--- sound/soc/codecs/cs35l41.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/cs35l41.c +2 -2
@@ -1035,8 +1035,8 @@ static int cs35l41_irq_gpio_config(struct cs35l41_private *cs35l41)regmap_update_bits (cs35l41->regmap,CS35L41_GPIO2_CTRL1 ,CS35L41_GPIO_POL_MASK |CS35L41_GPIO_DIR_MASK , - irq_gpio_cfg1->irq_pol_inv <<CS35L41_GPIO_POL_SHIFT | - !irq_gpio_cfg1->irq_out_en <<CS35L41_GPIO_DIR_SHIFT ); + irq_gpio_cfg2->irq_pol_inv <<CS35L41_GPIO_POL_SHIFT | + !irq_gpio_cfg2->irq_out_en <<CS35L41_GPIO_DIR_SHIFT ); regmap_update_bits(cs35l41->regmap, CS35L41_GPIO_PAD_CONTROL, CS35L41_GPIO1_CTRL_MASK | CS35L41_GPIO2_CTRL_MASK,
Signature · 1 line
2.35.1
Re: [PATCH v2 01/20] ASoC: cs35l41: Fix GPIO2 configuration
Quoted 8 lines · Lucas Tanure
From: David Rhodes <[email protected]>
Fix GPIO2 polarity and direction configuration
Fixes fe1024d50477b ("ASoC: cs35l41: Combine adjacent register writes")Signed-off-by David Rhodes <[email protected]>Acked-by Charles Keepax <[email protected]>---
Really sorry I only just spotted this but you are missing your own sign off here. You always need to personally sign each patch you are sending up.
Thanks,
Charles
Re: [PATCH v2 01/20] ASoC: cs35l41: Fix GPIO2 configuration
Quoted 10 lines · Charles Keepax
Quoted 8 lines · Lucas Tanure
From: David Rhodes <[email protected]>
Fix GPIO2 polarity and direction configuration
Fixes fe1024d50477b ("ASoC: cs35l41: Combine adjacent register writes")Signed-off-by David Rhodes <[email protected]>Acked-by Charles Keepax <[email protected]>---
Quoted 7 lines
Really sorry I only just spotted this but you are missing your own sign off here. You always need to personally sign each patch you are sending up.
Thanks,
Charles
Yes, sorry about that. I will give some time for more reviews on this version and fix it on v3.
PATCH v2 2/20 ASoC: cs35l41: Fix max number of TX channels
In reply to Lucas TanureThis device only has 4 TX channels.
--- sound/soc/codecs/cs35l41.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs35l41.c +1 -1
@@ -1091,7 +1091,7 @@ static struct snd_soc_dai_driver cs35l41_dai[] = { .capture = { .stream_name = "AMP Capture", .channels_min = 1, - .channels_max = 8, + .channels_max = 4, .rates = SNDRV_PCM_RATE_KNOT, .formats = CS35L41_TX_FORMATS, },
Signature · 1 line
2.35.1
PATCH v2 3/20 ASoC: cs35l41: Fix DSP mbox start command and global enable order
In reply to Lucas TanureGlobal enable must happen before CSPL_MBOX_CMD_RESUME command is sent. Move it to PRE_PMU as both events use SND_SOC_DAPM_OUT_DRV_E macro.
--- sound/soc/codecs/cs35l41.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/cs35l41.c +2 -2
@@ -573,7 +573,7 @@ static int cs35l41_main_amp_event(struct snd_soc_dapm_widget *w,int ret =0 ;switch (event) { -case SND_SOC_DAPM_POST_PMU : +case SND_SOC_DAPM_PRE_PMU :regmap_multi_reg_write_bypassed (cs35l41->regmap, cs35l41_pup_patch,ARRAY_SIZE (cs35l41_pup_patch));
@@ -649,7 +649,7 @@ static const struct snd_soc_dapm_widget cs35l41_dapm_widgets[] = {SND_SOC_DAPM_OUT_DRV_E ("Main AMP" ,CS35L41_PWR_CTRL2 ,0 ,0 ,NULL ,0 , cs35l41_main_amp_event, -SND_SOC_DAPM_POST_PMD |SND_SOC_DAPM_POST_PMU ), +SND_SOC_DAPM_POST_PMD |SND_SOC_DAPM_PRE_PMU ),SND_SOC_DAPM_MUX ("ASP TX1 Source" ,SND_SOC_NOPM ,0 ,0 , &asp_tx1_mux), SND_SOC_DAPM_MUX("ASP TX2 Source", SND_SOC_NOPM, 0, 0, &asp_tx2_mux),
Signature · 1 line
2.35.1
PATCH v2 4/20 ASoC: cs35l41: Remove unnecessary param
In reply to Lucas Tanurecs35l41_private is not used on cs35l41_handle_pdata
--- sound/soc/codecs/cs35l41.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/codecs/cs35l41.c +2 -4
@@ -1115,9 +1115,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs35l41 = { .set_sysclk = cs35l41_component_set_sysclk, }; -static int cs35l41_handle_pdata (struct device *dev, -struct cs35l41_platform_data *pdata, -struct cs35l41_private *cs35l41) +static int cs35l41_handle_pdata (struct device *dev,struct cs35l41_platform_data *pdata) {struct cs35l41_irq_cfg *irq_gpio1_config = &pdata->irq_config1;struct cs35l41_irq_cfg *irq_gpio2_config = &pdata->irq_config2;
@@ -1260,7 +1258,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,if (pdata) { cs35l41->pdata = *pdata; }else { - ret =cs35l41_handle_pdata (cs35l41->dev, &cs35l41->pdata, cs35l41); + ret =cs35l41_handle_pdata (cs35l41->dev, &cs35l41->pdata);if (ret !=0 )return ret; }
Signature · 1 line
2.35.1
PATCH v2 5/20 sound: cs35l41: Unify hardware configuration
In reply to Lucas TanureBoth ASoC and HDA require to configure the GPIOs
and Boost, so put that in single shared struct.
--- include/sound/cs35l41.h | 35 +++++++++---- sound/pci/hda/cs35l41_hda.c | 69 +++++++++++-------------- sound/pci/hda/cs35l41_hda.h | 13 +---- sound/soc/codecs/cs35l41-i2c.c | 4 +- sound/soc/codecs/cs35l41-spi.c | 4 +- sound/soc/codecs/cs35l41.c | 93 +++++++++++++++------------------- sound/soc/codecs/cs35l41.h | 5 +- 7 files changed, 102 insertions(+), 121 deletions(-)
include/sound/cs35l41.h +25 -10
@@ -701,9 +701,6 @@#define CS35L41_GPIO1_CTRL_SHIFT 16#define CS35L41_GPIO2_CTRL_MASK 0x07000000#define CS35L41_GPIO2_CTRL_SHIFT 24 -#define CS35L41_GPIO_CTRL_OPEN_INT 2 -#define CS35L41_GPIO_CTRL_ACTV_LO 4 -#define CS35L41_GPIO_CTRL_ACTV_HI 5#define CS35L41_GPIO_POL_MASK 0x1000#define CS35L41_GPIO_POL_SHIFT 12
@@ -735,19 +732,37 @@ enum cs35l41_clk_ids { CS35L41_CLKID_MCLK = 4, }; -struct cs35l41_irq_cfg { -bool irq_pol_inv; -bool irq_out_en; -int irq_src_sel; +enum cs35l41_gpio_func { +CS35L41_HIZ , +CS35L41_GPIO , +CS35L41_INT_OPEN_DRAIN_GPIO2 , +CS35L41_MCLK , +CS35L41_INT_PUSH_PULL_LOW_GPIO2 , +CS35L41_INT_PUSH_PULL_HIGH_GPIO2 , +CS35L41_PDM_CLK_GPIO2 , +CS35L41_PDM_DATA_GPIO2 , +CS35L41_MDSYNC_GPIO1 =2 , +CS35L41_PDM_CLK_GPIO1 =4 , +CS35L41_PDM_DATA_GPIO1 =5 , }; -struct cs35l41_platform_data { +struct cs35l41_gpio_cfg { +bool pol_inv; +bool out_en; +enum cs35l41_gpio_func func; +}; + +struct cs35l41_hw_cfg {int bst_ind;int bst_ipk;int bst_cap;int dout_hiz; -struct cs35l41_irq_cfg irq_config1; -struct cs35l41_irq_cfg irq_config2; +struct cs35l41_gpio_cfg gpio1; +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; };struct cs35l41_otp_packed_element_t {
sound/pci/hda/cs35l41_hda.c +29 -40
188 lines not on this page · raw message
sound/pci/hda/cs35l41_hda.h +1 -12
@@ -40,26 +40,15 @@ struct cs35l41_hda_reg_sequence {unsigned int num_close; }; -struct cs35l41_hda_hw_config { -unsigned int spk_pos; -unsigned int gpio1_func; -unsigned int gpio2_func; -int bst_ind; -int bst_ipk; -int bst_cap; -}; -struct cs35l41_hda {struct device *dev;struct regmap *regmap;struct gpio_desc *reset_gpio;const struct cs35l41_hda_reg_sequence *reg_seq; +struct cs35l41_hw_cfg hw_cfg;int irq;int index; - -/* Don't put the AMP in reset of VSPK can not be turned off */ -bool vspk_always_on; }; int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,
sound/soc/codecs/cs35l41-i2c.c +2 -2
@@ -34,7 +34,7 @@ static int cs35l41_i2c_probe(struct i2c_client *client, {struct cs35l41_private *cs35l41;struct device *dev = &client->dev; -struct cs35l41_platform_data *pdata =dev_get_platdata (dev); +struct cs35l41_hw_cfg *hw_cfg =dev_get_platdata (dev);const struct regmap_config *regmap_config = &cs35l41_regmap_i2c;int ret;
@@ -54,7 +54,7 @@ static int cs35l41_i2c_probe(struct i2c_client *client,return ret; } -return cs35l41_probe (cs35l41, pdata); +return cs35l41_probe (cs35l41, hw_cfg); }static int cs35l41_i2c_remove (struct i2c_client *client)
sound/soc/codecs/cs35l41-spi.c +2 -2
@@ -30,7 +30,7 @@ MODULE_DEVICE_TABLE(spi, cs35l41_id_spi);static int cs35l41_spi_probe (struct spi_device *spi) {const struct regmap_config *regmap_config = &cs35l41_regmap_spi; -struct cs35l41_platform_data *pdata =dev_get_platdata (&spi->dev); +struct cs35l41_hw_cfg *hw_cfg =dev_get_platdata (&spi->dev);struct cs35l41_private *cs35l41;int ret;
@@ -52,7 +52,7 @@ static int cs35l41_spi_probe(struct spi_device *spi) cs35l41->dev = &spi->dev; cs35l41->irq = spi->irq; -return cs35l41_probe (cs35l41, pdata); +return cs35l41_probe (cs35l41, hw_cfg); }static void cs35l41_spi_remove (struct spi_device *spi)
sound/soc/codecs/cs35l41.c +41 -52
168 lines not on this page · raw message
sound/soc/codecs/cs35l41.h +2 -3
@@ -44,7 +44,7 @@ enum cs35l41_cspl_mbox_cmd {struct cs35l41_private {struct wm_adsp dsp;/* needs to be first member */ struct snd_soc_codec *codec; -struct cs35l41_platform_data pdata; +struct cs35l41_hw_cfg hw_cfg;struct device *dev;struct regmap *regmap;struct regulator_bulk_data supplies[CS35L41_NUM_SUPPLIES ];
@@ -53,8 +53,7 @@ struct cs35l41_private { struct gpio_desc *reset_gpio; }; -int cs35l41_probe (struct cs35l41_private *cs35l41, -struct cs35l41_platform_data *pdata); +int cs35l41_probe (struct cs35l41_private *cs35l41,const struct cs35l41_hw_cfg *hw_cfg);void cs35l41_remove (struct cs35l41_private *cs35l41);#endif /*__CS35L41_H__*/
Signature · 1 line
2.35.1
PATCH v2 6/20 sound: cs35l41: Check hw_config before using it
In reply to Lucas TanureThe driver can receive an empty hw_config, so mark as valid if successfully read from device tree or ACPI.
Platforms not marked with a valid hw config will not be supported.
--- include/sound/cs35l41.h | 3 +- sound/pci/hda/cs35l41_hda.c | 70 +++++++++++++++++++------------ sound/soc/codecs/cs35l41-lib.c | 16 ++++--- sound/soc/codecs/cs35l41.c | 77 +++++++++++++++++++++------------- 4 files changed, 105 insertions(+), 61 deletions(-)
include/sound/cs35l41.h +2 -1
@@ -538,7 +538,6 @@#define CS35L41_OTP_SIZE_WORDS 32#define CS35L41_NUM_OTP_ELEM 100 -#define CS35L41_VALID_PDATA 0x80000000#define CS35L41_NUM_SUPPLIES 2#define CS35L41_SCLK_MSTR_MASK 0x10
@@ -747,12 +746,14 @@ enum cs35l41_gpio_func { };struct cs35l41_gpio_cfg { +bool valid;bool pol_inv;bool out_en;enum cs35l41_gpio_func func; };struct cs35l41_hw_cfg { +bool valid;int bst_ind;int bst_ipk;int bst_cap;
sound/pci/hda/cs35l41_hda.c +43 -27
123 lines not on this page · raw message
sound/soc/codecs/cs35l41-lib.c +11 -5
@@ -992,10 +992,20 @@ int cs35l41_boost_config(struct device *dev, struct regmap *regmap, int boost_in case 101 ... 200: bst_cbst_range =3 ;break ; -default :/* 201 uF and greater */ +default : +if (boost_cap <0 ) { +dev_err (dev,"Invalid boost capacitor value: %d nH\n" , boost_cap); +return -EINVAL ; + } +/* 201 uF and greater */ bst_cbst_range =4 ; } +if (boost_ipk <1600 || boost_ipk >4500 ) { +dev_err (dev,"Invalid boost inductor peak current: %d mA\n" , boost_ipk); +return -EINVAL ; + } + ret =regmap_update_bits (regmap,CS35L41_BSTCVRT_COEFF ,CS35L41_BST_K1_MASK |CS35L41_BST_K2_MASK , cs35l41_bst_k1_table[bst_lbst_val][bst_cbst_range]
@@ -1017,10 +1027,6 @@ int cs35l41_boost_config(struct device *dev, struct regmap *regmap, int boost_inreturn ret; } -if (boost_ipk <1600 || boost_ipk >4500 ) { -dev_err (dev,"Invalid boost inductor peak current: %d mA\n" , boost_ipk); -return -EINVAL ; - } bst_ipk_scaled = ((boost_ipk -1600 ) /50 ) +0x10 ; ret = regmap_update_bits(regmap, CS35L41_BSTCVRT_PEAK_CUR, CS35L41_BST_IPK_MASK,
sound/soc/codecs/cs35l41.c +49 -28
122 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v2 7/20 sound: cs35l41: Move cs35l41_gpio_config to shared lib
In reply to Lucas TanureASoC and HDA can use a single function to configure gpios
--- include/sound/cs35l41.h | 1 + sound/pci/hda/cs35l41_hda.c | 11 ++++----- sound/soc/codecs/cs35l41-lib.c | 41 +++++++++++++++++++++++++++++++ sound/soc/codecs/cs35l41.c | 45 +--------------------------------- 4 files changed, 48 insertions(+), 50 deletions(-)
include/sound/cs35l41.h +1 -0
@@ -792,5 +792,6 @@ int cs35l41_set_channels(struct device *dev, struct regmap *reg, unsigned int rx_num, unsigned int *rx_slot);int cs35l41_boost_config (struct device *dev,struct regmap *regmap,int boost_ind,int boost_cap,int boost_ipk); +int cs35l41_gpio_config (struct regmap *regmap,struct cs35l41_hw_cfg *hw_cfg);#endif /* __CS35L41_H */
sound/pci/hda/cs35l41_hda.c +5 -6
@@ -235,12 +235,11 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)case CS35L41_NOT_USED :break ;case CS35l41_VSPK_SWITCH: -regmap_update_bits (cs35l41->regmap,CS35L41_GPIO_PAD_CONTROL , -CS35L41_GPIO1_CTRL_MASK ,1 <<CS35L41_GPIO1_CTRL_SHIFT ); + hw_cfg->gpio1.func =CS35L41_GPIO ; + hw_cfg->gpio1.out_en = true;break ;case CS35l41_SYNC: -regmap_update_bits (cs35l41->regmap,CS35L41_GPIO_PAD_CONTROL , -CS35L41_GPIO1_CTRL_MASK ,2 <<CS35L41_GPIO1_CTRL_SHIFT ); + hw_cfg->gpio1.func =CS35L41_MDSYNC_GPIO1 ;break ;default : dev_err(cs35l41->dev, "Invalid function %d for GPIO1\n",
@@ -254,8 +253,6 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)case CS35L41_NOT_USED :break ;case CS35L41_INTERRUPT : -regmap_update_bits (cs35l41->regmap,CS35L41_GPIO_PAD_CONTROL , -CS35L41_GPIO2_CTRL_MASK ,2 <<CS35L41_GPIO2_CTRL_SHIFT );break ;default :dev_err (cs35l41->dev,"Invalid GPIO2 function %d\n" , hw_cfg->gpio2.func);
@@ -263,6 +260,8 @@ 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,
sound/soc/codecs/cs35l41-lib.c +41 -0
47 lines not on this page · raw message
sound/soc/codecs/cs35l41.c +1 -44
57 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v2 8/20 hda: cs35l41: Fix I2S params comments
In reply to Lucas TanureFix clock and slot size comments
--- sound/pci/hda/cs35l41_hda.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/cs35l41_hda.c +2 -2
@@ -17,11 +17,11 @@#include "cs35l41_hda.h" static const struct reg_sequence cs35l41_hda_config[] = { - {CS35L41_PLL_CLK_CTRL ,0x00000430 },// 3200000Hz, BCLK Input, PLL_REFCLK_EN = 1 + {CS35L41_PLL_CLK_CTRL ,0x00000430 },// 3072000Hz, BCLK Input, PLL_REFCLK_EN = 1 {CS35L41_GLOBAL_CLK_CTRL ,0x00000003 },// GLOBAL_FS = 48 kHz {CS35L41_SP_ENABLES ,0x00010000 },// ASP_RX1_EN = 1 {CS35L41_SP_RATE_CTRL ,0x00000021 },// ASP_BCLK_FREQ = 3.072 MHz - {CS35L41_SP_FORMAT ,0x20200200 },// 24 bits, I2S, BCLK Slave, FSYNC Slave + {CS35L41_SP_FORMAT ,0x20200200 },// 32 bits RX/TX slots, I2S, clk consumer {CS35L41_DAC_PCM1_SRC ,0x00000008 },// DACPCM1_SRC = ASPRX1 {CS35L41_AMP_DIG_VOL_CTRL ,0x00000000 },// AMP_VOL_PCM 0.0 dB {CS35L41_AMP_GAIN_CTRL ,0x00000084 },// AMP_GAIN_PCM 4.5 dB
Signature · 1 line
2.35.1
PATCH v2 9/20 hda: cs35l41: Always configure the DAI
In reply to Lucas TanureThe Dai configuration is always the same and
should always configured during open.
--- sound/pci/hda/cs35l41_hda.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
sound/pci/hda/cs35l41_hda.c +2 -8
@@ -111,8 +111,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), - .open = cs35l41_hda_config, - .num_open =ARRAY_SIZE (cs35l41_hda_config), .prepare = cs35l41_safe_to_active, .num_prepare =ARRAY_SIZE (cs35l41_safe_to_active), .cleanup = cs35l41_active_to_safe,
@@ -120,8 +118,6 @@ static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_no_bst = { };static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_ext_bst = { - .open = cs35l41_hda_config, - .num_open =ARRAY_SIZE (cs35l41_hda_config), .prepare = cs35l41_start_ext_vspk, .num_prepare =ARRAY_SIZE (cs35l41_start_ext_vspk), .cleanup = cs35l41_stop_ext_vspk,
@@ -129,8 +125,6 @@ static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_ext_bst = { };static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_int_bst = { - .open = cs35l41_hda_config, - .num_open =ARRAY_SIZE (cs35l41_hda_config), .prepare = cs35l41_hda_start_bst, .num_prepare =ARRAY_SIZE (cs35l41_hda_start_bst), .cleanup = cs35l41_hda_stop_bst,
@@ -146,8 +140,8 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)switch (action) {case HDA_GEN_PCM_ACT_OPEN : -if (reg_seq->open) - ret =regmap_multi_reg_write (reg, reg_seq->open, reg_seq->num_open); + ret =regmap_multi_reg_write (reg, cs35l41_hda_config, +ARRAY_SIZE (cs35l41_hda_config));break ;case HDA_GEN_PCM_ACT_PREPARE :if (reg_seq->prepare)
Signature · 1 line
2.35.1
PATCH v2 10/20 hda: cs35l41: Add Boost type flag
In reply to Lucas TanureReplace vspk_always_on by a enum that better
characterizes the system, as there is 3 types
of boost hardware.
--- include/sound/cs35l41.h | 9 ++++++-- sound/pci/hda/cs35l41_hda.c | 43 +++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 21 deletions(-)
include/sound/cs35l41.h +7 -2
@@ -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 {
sound/pci/hda/cs35l41_hda.c +24 -19
87 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v2 11/20 hda: cs35l41: Put the device into safe mode for external boost
In reply to Lucas TanureAll external boost setups should be put into safe mode.
--- sound/pci/hda/cs35l41_hda.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
sound/pci/hda/cs35l41_hda.c +8 -5
@@ -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);
Signature · 1 line
2.35.1
PATCH v2 12/20 hda: cs35l41: Mute the device before shutdown
In reply to Lucas TanureMute the device before shutdown to avoid pops
and clicks all types of boost.
--- sound/pci/hda/cs35l41_hda.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/pci/hda/cs35l41_hda.c +6 -1
@@ -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 ;
Signature · 1 line
2.35.1
PATCH v2 13/20 sound: cs35l41: Enable Internal Boost in shared lib
In reply to Lucas TanureBoost enable is the default option from reset,
but with external boost support, internal boost
must be disabled.
Add the enable of boost in cs35l41_boost_config
to centralize the internal boost configuration.
--- sound/soc/codecs/cs35l41-lib.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/cs35l41-lib.c +3 -0
@@ -1036,6 +1036,9 @@ int cs35l41_boost_config(struct device *dev, struct regmap *regmap, int boost_inreturn ret; } +regmap_update_bits (regmap,CS35L41_PWR_CTRL2 ,CS35L41_BST_EN_MASK , +CS35L41_BST_EN_DEFAULT <<CS35L41_BST_EN_SHIFT ); +return 0 ; }EXPORT_SYMBOL_GPL (cs35l41_boost_config);
Signature · 1 line
2.35.1
Re: [PATCH v2 13/20] sound: cs35l41: Enable Internal Boost in shared lib
Quoted 8 lines · Lucas Tanure
Boost enable is the default option from reset,
but with external boost support, internal boost
must be disabled.
Add the enable of boost incs35l41_boost_config
to centralize the internal boost configuration.Signed-off-by Lucas Tanure <[email protected]>---
Thanks,
Charles
PATCH v2 14/20 hda: cs35l41: Move boost config to initialization code
In reply to Lucas TanureBoost configuration doesn't need to be written for every new stream, so move it to the initialization code.
--- include/sound/cs35l41.h | 1 + sound/pci/hda/cs35l41_hda.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-)
include/sound/cs35l41.h +1 -0
@@ -661,6 +661,7 @@#define CS35L41_GLOBAL_EN_SHIFT 0#define CS35L41_BST_EN_MASK 0x0030#define CS35L41_BST_EN_SHIFT 4 +#define CS35L41_BST_DIS_FET_OFF 0x00#define CS35L41_BST_EN_DEFAULT 0x2#define CS35L41_AMP_EN_SHIFT 0#define CS35L41_AMP_EN_MASK 1
sound/pci/hda/cs35l41_hda.c +8 -5
@@ -25,7 +25,6 @@ static const struct reg_sequence cs35l41_hda_config[] = { { CS35L41_DAC_PCM1_SRC, 0x00000008 }, // DACPCM1_SRC = ASPRX1 { CS35L41_AMP_DIG_VOL_CTRL, 0x00000000 }, // AMP_VOL_PCM 0.0 dB { CS35L41_AMP_GAIN_CTRL, 0x00000084 }, // AMP_GAIN_PCM 4.5 dB - { CS35L41_PWR_CTRL2, 0x00000001 }, // AMP_EN = 1 }; static const struct reg_sequence cs35l41_hda_mute[] = {
@@ -34,7 +33,6 @@ static const struct reg_sequence cs35l41_hda_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 };
@@ -94,7 +92,6 @@ static const struct reg_sequence cs35l41_active_to_safe[] = { { 0x00000040, 0x00000055 }, { 0x00000040, 0x000000AA }, { 0x00007438, 0x00585941 }, - { CS35L41_PWR_CTRL2, 0x00000000 }, // AMP_EN = 0 { CS35L41_PWR_CTRL1, 0x00000000 }, { 0x0000742C, 0x00000009, 2000 }, { 0x00007438, 0x00580941 },
@@ -144,6 +141,8 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)case HDA_GEN_PCM_ACT_OPEN : ret =regmap_multi_reg_write (reg, cs35l41_hda_config,ARRAY_SIZE (cs35l41_hda_config)); +regmap_update_bits (reg,CS35L41_PWR_CTRL2 , +CS35L41_AMP_EN_MASK ,1 <<CS35L41_AMP_EN_SHIFT );break ;case HDA_GEN_PCM_ACT_PREPARE :if (reg_seq->prepare)
@@ -155,6 +154,8 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action) ret =regmap_multi_reg_write (reg, reg_seq->cleanup, reg_seq->num_cleanup);break ;case HDA_GEN_PCM_ACT_CLOSE : +regmap_update_bits (reg,CS35L41_PWR_CTRL2 , +CS35L41_AMP_EN_MASK ,0 <<CS35L41_AMP_EN_SHIFT );if (reg_seq->close) ret =regmap_multi_reg_write (reg, reg_seq->close, reg_seq->num_close);break ;
@@ -232,8 +233,10 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41) 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)); +regmap_multi_reg_write (cs35l41->regmap, cs35l41_reset_to_safe, +ARRAY_SIZE (cs35l41_reset_to_safe)); + ret =regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL2 ,CS35L41_BST_EN_MASK , +CS35L41_BST_DIS_FET_OFF <<CS35L41_BST_EN_SHIFT );if (ret)return ret;break ;
Signature · 1 line
2.35.1
PATCH v2 15/20 hda: cs35l41: Remove cs35l41_hda_reg_sequence struct
In reply to Lucas TanureRemove cs35l41_hd_reg_sequence as it adds a
layer of flexibility not needed.
--- sound/pci/hda/cs35l41_hda.c | 79 ++++++++++++++++--------------------- sound/pci/hda/cs35l41_hda.h | 14 ------- 2 files changed, 33 insertions(+), 60 deletions(-)
sound/pci/hda/cs35l41_hda.c +33 -46
@@ -32,14 +32,6 @@ static const struct reg_sequence cs35l41_hda_mute[] = { { CS35L41_AMP_DIG_VOL_CTRL, 0x0000A678 }, // AMP_VOL_PCM Mute }; -static const struct reg_sequence cs35l41_hda_start_bst[] = { - {CS35L41_PWR_CTRL1 ,0x00000001 ,3000 },// set GLOBAL_EN = 1 -}; - -static const struct reg_sequence cs35l41_hda_stop_bst[] = { - {CS35L41_PWR_CTRL1 ,0x00000000 ,3000 },// set GLOBAL_EN = 0 -}; -// only on amps where GPIO1 is used to control ext. VSPK switch static const struct reg_sequence cs35l41_start_ext_vspk[] = { { 0x00000040, 0x00000055 },
@@ -109,31 +101,44 @@ static const struct reg_sequence cs35l41_reset_to_safe[] = { { 0x00000040, 0x00000033 }, }; -static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_no_bst = { - .prepare = cs35l41_safe_to_active, - .num_prepare =ARRAY_SIZE (cs35l41_safe_to_active), - .cleanup = cs35l41_active_to_safe, - .num_cleanup =ARRAY_SIZE (cs35l41_active_to_safe), -}; +static int cs35l41_hda_global_enable (struct cs35l41_hda *cs35l41,int enable) +{ +int ret; -static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_ext_bst = { - .prepare = cs35l41_start_ext_vspk, - .num_prepare =ARRAY_SIZE (cs35l41_start_ext_vspk), - .cleanup = cs35l41_stop_ext_vspk, - .num_cleanup =ARRAY_SIZE (cs35l41_stop_ext_vspk), -}; +switch (cs35l41->hw_cfg.bst_type) { +case CS35L41_INT_BOOST : + ret =regmap_update_bits (cs35l41->regmap,CS35L41_PWR_CTRL1 , +CS35L41_GLOBAL_EN_MASK , + enable <<CS35L41_GLOBAL_EN_SHIFT ); +usleep_range (3000 ,3100 ); +break ; +case CS35L41_EXT_BOOST : +if (enable) + ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41_start_ext_vspk, +ARRAY_SIZE (cs35l41_start_ext_vspk)); +else + ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41_stop_ext_vspk, +ARRAY_SIZE (cs35l41_stop_ext_vspk)); +break ; +case CS35L41_EXT_BOOST_NO_VSPK_SWITCH : +if (enable) + ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41_safe_to_active, +ARRAY_SIZE (cs35l41_safe_to_active)); +else + ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41_active_to_safe, +ARRAY_SIZE (cs35l41_active_to_safe)); +break ; +default : + ret = -EINVAL ; +break ; + } -static const struct cs35l41_hda_reg_sequence cs35l41_hda_reg_seq_int_bst = { - .prepare = cs35l41_hda_start_bst, - .num_prepare =ARRAY_SIZE (cs35l41_hda_start_bst), - .cleanup = cs35l41_hda_stop_bst, - .num_cleanup =ARRAY_SIZE (cs35l41_hda_stop_bst), +return ret; };static void cs35l41_hda_playback_hook (struct device *dev,int action) {struct cs35l41_hda *cs35l41 =dev_get_drvdata (dev); -const struct cs35l41_hda_reg_sequence *reg_seq = cs35l41->reg_seq;struct regmap *reg = cs35l41->regmap;int ret =0 ;
@@ -145,19 +150,15 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action) CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);break ;case HDA_GEN_PCM_ACT_PREPARE : -if (reg_seq->prepare) - ret =regmap_multi_reg_write (reg, reg_seq->prepare, reg_seq->num_prepare); + ret =cs35l41_hda_global_enable (cs35l41,1 );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); + ret =cs35l41_hda_global_enable (cs35l41,0 );break ;case HDA_GEN_PCM_ACT_CLOSE :regmap_update_bits (reg,CS35L41_PWR_CTRL2 ,CS35L41_AMP_EN_MASK ,0 <<CS35L41_AMP_EN_SHIFT ); -if (reg_seq->close) - ret =regmap_multi_reg_write (reg, reg_seq->close, reg_seq->num_close);break ;default : ret = -EINVAL ;
@@ -221,7 +222,6 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)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)
@@ -229,10 +229,6 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)break ;case CS35L41_EXT_BOOST :case CS35L41_EXT_BOOST_NO_VSPK_SWITCH : -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;regmap_multi_reg_write (cs35l41->regmap, cs35l41_reset_to_safe,ARRAY_SIZE (cs35l41_reset_to_safe)); ret = regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2, CS35L41_BST_EN_MASK,
@@ -511,15 +507,6 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int iif (ret) goto err; -if (cs35l41->reg_seq->probe) { - ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41->reg_seq->probe, - cs35l41->reg_seq->num_probe); -if (ret) { -dev_err (cs35l41->dev,"Fail to apply probe reg patch: %d\n" , ret); - goto err; - } - } - ret =component_add (cs35l41->dev, &cs35l41_hda_comp_ops);if (ret) {dev_err (cs35l41->dev,"Register component failed: %d\n" , ret);
sound/pci/hda/cs35l41_hda.h +0 -14
@@ -27,24 +27,10 @@ enum cs35l41_hda_gpio_function { CS35l41_SYNC, }; -struct cs35l41_hda_reg_sequence { -const struct reg_sequence *probe; -unsigned int num_probe; -const struct reg_sequence *open; -unsigned int num_open; -const struct reg_sequence *prepare; -unsigned int num_prepare; -const struct reg_sequence *cleanup; -unsigned int num_cleanup; -const struct reg_sequence *close; -unsigned int num_close; -}; -struct cs35l41_hda {struct device *dev;struct regmap *regmap;struct gpio_desc *reset_gpio; -const struct cs35l41_hda_reg_sequence *reg_seq;struct cs35l41_hw_cfg hw_cfg;int irq;
Signature · 1 line
2.35.1
PATCH v2 16/20 hda: cs35l41: Reorganize log for playback actions
In reply to Lucas TanureFor each case, only log the last regmap access so it doesn't get overwritten, and all regmap access should show the same issues. Change to dev_err to log this error.
Also, differentiate between a regmap access failure and invalid playback action.
--- sound/pci/hda/cs35l41_hda.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
sound/pci/hda/cs35l41_hda.c +7 -8
@@ -144,10 +144,9 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)switch (action) {case HDA_GEN_PCM_ACT_OPEN : - ret =regmap_multi_reg_write (reg, cs35l41_hda_config, -ARRAY_SIZE (cs35l41_hda_config)); -regmap_update_bits (reg,CS35L41_PWR_CTRL2 , -CS35L41_AMP_EN_MASK ,1 <<CS35L41_AMP_EN_SHIFT ); +regmap_multi_reg_write (reg, cs35l41_hda_config,ARRAY_SIZE (cs35l41_hda_config)); + ret =regmap_update_bits (reg,CS35L41_PWR_CTRL2 , +CS35L41_AMP_EN_MASK ,1 <<CS35L41_AMP_EN_SHIFT );break ;case HDA_GEN_PCM_ACT_PREPARE : ret =cs35l41_hda_global_enable (cs35l41,1 );
@@ -157,16 +156,16 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action) ret =cs35l41_hda_global_enable (cs35l41,0 );break ;case HDA_GEN_PCM_ACT_CLOSE : -regmap_update_bits (reg,CS35L41_PWR_CTRL2 , -CS35L41_AMP_EN_MASK ,0 <<CS35L41_AMP_EN_SHIFT ); + ret =regmap_update_bits (reg,CS35L41_PWR_CTRL2 , +CS35L41_AMP_EN_MASK ,0 <<CS35L41_AMP_EN_SHIFT );break ;default : - ret = -EINVAL ; +dev_warn (cs35l41->dev,"Playback action not supported: %d\n" , action);break ; }if (ret) -dev_warn (cs35l41->dev,"Failed to apply multi reg write: %d\n" , ret); +dev_err (cs35l41->dev,"Regmap access fail: %d\n" , ret); } static int cs35l41_hda_channel_map(struct device *dev, unsigned int tx_num, unsigned int *tx_slot,
Signature · 1 line
2.35.1
PATCH v2 17/20 hda: cs35l41: Handle all external boost setups the same way
In reply to Lucas TanureRegmap sequences for external boost with or without the GPIO1 as VSPK switch are almost the same.
Unify them and use the GPIO1 VSPK switch to handle the difference.
--- sound/pci/hda/cs35l41_hda.c | 60 +++++++++++++++---------------------- 1 file changed, 24 insertions(+), 36 deletions(-)
sound/pci/hda/cs35l41_hda.c +24 -36
@@ -32,33 +32,9 @@ static const struct reg_sequence cs35l41_hda_mute[] = { { CS35L41_AMP_DIG_VOL_CTRL, 0x0000A678 }, // AMP_VOL_PCM Mute }; -// only on amps where GPIO1 is used to control ext. VSPK switch -static const struct reg_sequence cs35l41_start_ext_vspk[] = { +static const struct reg_sequence cs35l41_safe_to_reset[] = { {0x00000040 ,0x00000055 }, {0x00000040 ,0x000000AA }, - {0x00007438 ,0x00585941 }, - {0x00007414 ,0x08C82222 }, - {0x0000742C ,0x00000009 }, - {0x00011008 ,0x00008001 }, - {0x0000742C ,0x0000000F }, - {0x0000742C ,0x00000079 }, - {0x00007438 ,0x00585941 }, - {CS35L41_PWR_CTRL1 ,0x00000001 ,3000 },// set GLOBAL_EN = 1 - {0x0000742C ,0x000000F9 }, - {0x00007438 ,0x00580941 }, - {0x00000040 ,0x000000CC }, - {0x00000040 ,0x00000033 }, -}; - -//only on amps where GPIO1 is used to control ext. VSPK switch -static const struct reg_sequence cs35l41_stop_ext_vspk[] = { - {0x00000040 ,0x00000055 }, - {0x00000040 ,0x000000AA }, - {0x00007438 ,0x00585941 }, - {0x00002014 ,0x00000000 ,3000 },// set GLOBAL_EN = 0 - {0x0000742C ,0x00000009 }, - {0x00007438 ,0x00580941 }, - {0x00011008 ,0x00000001 }, {0x0000393C ,0x000000C0 ,6000 }, {0x0000393C ,0x00000000 }, { 0x00007414, 0x00C82222 },
@@ -73,7 +49,7 @@ static const struct reg_sequence cs35l41_safe_to_active[] = { { 0x0000742C, 0x0000000F }, { 0x0000742C, 0x00000079 }, { 0x00007438, 0x00585941 }, - { CS35L41_PWR_CTRL1, 0x00000001, 2000 }, // GLOBAL_EN = 1 + { CS35L41_PWR_CTRL1, 0x00000001, 3000 }, // GLOBAL_EN = 1 { 0x0000742C, 0x000000F9 }, { 0x00007438, 0x00580941 }, { 0x00000040, 0x000000CC },
@@ -85,7 +61,7 @@ static const struct reg_sequence cs35l41_active_to_safe[] = { { 0x00000040, 0x000000AA }, { 0x00007438, 0x00585941 }, { CS35L41_PWR_CTRL1, 0x00000000 }, - { 0x0000742C, 0x00000009, 2000 }, + { 0x0000742C, 0x00000009, 3000 }, { 0x00007438, 0x00580941 }, { 0x00000040, 0x000000CC }, { 0x00000040, 0x00000033 },
@@ -101,6 +77,21 @@ static const struct reg_sequence cs35l41_reset_to_safe[] = { { 0x00000040, 0x00000033 }, }; +static bool cs35l41_hda_safe_reset (struct cs35l41_hda *cs35l41) +{ +switch (cs35l41->hw_cfg.bst_type) { +case CS35L41_EXT_BOOST : +regmap_write (cs35l41->regmap,CS35L41_GPIO1_CTRL1 ,0x00000001 ); +regmap_multi_reg_write (cs35l41->regmap, cs35l41_safe_to_reset, +ARRAY_SIZE (cs35l41_safe_to_reset)); +return true; +case CS35L41_EXT_BOOST_NO_VSPK_SWITCH : +return false; +default : +return true; + } +}; +static int cs35l41_hda_global_enable (struct cs35l41_hda *cs35l41,int enable) {int ret;
@@ -113,13 +104,6 @@ static int cs35l41_hda_global_enable(struct cs35l41_hda *cs35l41, int enable)usleep_range (3000 ,3100 );break ;case CS35L41_EXT_BOOST : -if (enable) - ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41_start_ext_vspk, -ARRAY_SIZE (cs35l41_start_ext_vspk)); -else - ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41_stop_ext_vspk, -ARRAY_SIZE (cs35l41_stop_ext_vspk)); -break ;case CS35L41_EXT_BOOST_NO_VSPK_SWITCH :if (enable) ret = regmap_multi_reg_write(cs35l41->regmap, cs35l41_safe_to_active,
@@ -147,6 +131,8 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)regmap_multi_reg_write (reg, cs35l41_hda_config,ARRAY_SIZE (cs35l41_hda_config)); ret =regmap_update_bits (reg,CS35L41_PWR_CTRL2 ,CS35L41_AMP_EN_MASK ,1 <<CS35L41_AMP_EN_SHIFT ); +if (cs35l41->hw_cfg.bst_type ==CS35L41_EXT_BOOST ) +regmap_write (reg,CS35L41_GPIO1_CTRL1 ,0x00008001 );break ;case HDA_GEN_PCM_ACT_PREPARE : ret =cs35l41_hda_global_enable (cs35l41,1 );
@@ -158,6 +144,8 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)case HDA_GEN_PCM_ACT_CLOSE : ret =regmap_update_bits (reg,CS35L41_PWR_CTRL2 ,CS35L41_AMP_EN_MASK ,0 <<CS35L41_AMP_EN_SHIFT ); +if (cs35l41->hw_cfg.bst_type ==CS35L41_EXT_BOOST ) +regmap_write (reg,CS35L41_GPIO1_CTRL1 ,0x00000001 );break ;default :dev_warn (cs35l41->dev,"Playback action not supported: %d\n" , action);
@@ -517,7 +505,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int ireturn 0 ; err: -if (cs35l41->hw_cfg.bst_type !=CS35L41_EXT_BOOST_NO_VSPK_SWITCH ) +if (cs35l41_hda_safe_reset (cs35l41))gpiod_set_value_cansleep (cs35l41->reset_gpio,0 );gpiod_put (cs35l41->reset_gpio);
@@ -531,7 +519,7 @@ void cs35l41_hda_remove(struct device *dev)component_del (cs35l41->dev, &cs35l41_hda_comp_ops); -if (cs35l41->hw_cfg.bst_type !=CS35L41_EXT_BOOST_NO_VSPK_SWITCH ) +if (cs35l41_hda_safe_reset (cs35l41))gpiod_set_value_cansleep (cs35l41->reset_gpio,0 );gpiod_put (cs35l41->reset_gpio); }
Signature · 1 line
2.35.1
PATCH v2 18/20 hda: cs35l41: Move external boost handling to lib for ASoC use
In reply to Lucas TanureTo add support for external boost for ASoC move the HDA external boost implementation to the shared lib.
--- include/sound/cs35l41.h | 4 + sound/pci/hda/cs35l41_hda.c | 119 ++---------------------------- sound/soc/codecs/cs35l41-lib.c | 129 ++++++++++++++++++++++++++++++++- 3 files changed, 137 insertions(+), 115 deletions(-)
include/sound/cs35l41.h +4 -0
@@ -799,5 +799,9 @@ int cs35l41_set_channels(struct device *dev, struct regmap *reg,int cs35l41_boost_config (struct device *dev,struct regmap *regmap,int boost_ind,int boost_cap,int boost_ipk);int cs35l41_gpio_config (struct regmap *regmap,struct cs35l41_hw_cfg *hw_cfg); +int cs35l41_init_boost (struct device *dev,struct regmap *regmap, +struct cs35l41_hw_cfg *hw_cfg); +bool cs35l41_safe_reset (struct regmap *regmap,enum cs35l41_boost_type b_type); +int cs35l41_global_enable (struct regmap *regmap,enum cs35l41_boost_type b_type,int enable);#endif /* __CS35L41_H */
sound/pci/hda/cs35l41_hda.c +7 -112
152 lines not on this page · raw message
sound/soc/codecs/cs35l41-lib.c +126 -3
141 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v2 19/20 ASoC: cs35l41: Support external boost
In reply to Lucas TanureAdd support for external boost voltage, where
GPIO1 must control a switch to isolate CS35L41
from the external Boost Voltage
--- include/sound/cs35l41.h | 4 +-- sound/soc/codecs/cs35l41-lib.c | 5 ++-- sound/soc/codecs/cs35l41.c | 49 +++++++++++++++++++++++++--------- 3 files changed, 41 insertions(+), 17 deletions(-)
include/sound/cs35l41.h +2 -2
@@ -701,6 +701,8 @@#define CS35L41_GPIO1_CTRL_SHIFT 16#define CS35L41_GPIO2_CTRL_MASK 0x07000000#define CS35L41_GPIO2_CTRL_SHIFT 24 +#define CS35L41_GPIO_LVL_SHIFT 15 +#define CS35L41_GPIO_LVL_MASK BIT(CS35L41_GPIO_LVL_SHIFT)#define CS35L41_GPIO_POL_MASK 0x1000#define CS35L41_GPIO_POL_SHIFT 12
@@ -796,8 +798,6 @@ int cs35l41_register_errata_patch(struct device *dev, struct regmap *reg, unsignint cs35l41_set_channels (struct device *dev,struct regmap *reg,unsigned int tx_num,unsigned int *tx_slot,unsigned int rx_num,unsigned int *rx_slot); -int cs35l41_boost_config (struct device *dev,struct regmap *regmap,int boost_ind,int boost_cap, -int boost_ipk);int cs35l41_gpio_config (struct regmap *regmap,struct cs35l41_hw_cfg *hw_cfg);int cs35l41_init_boost (struct device *dev,struct regmap *regmap,struct cs35l41_hw_cfg *hw_cfg);
sound/soc/codecs/cs35l41-lib.c +2 -3
@@ -954,8 +954,8 @@ static const unsigned char cs35l41_bst_slope_table[4] = { 0x75, 0x6B, 0x3B, 0x28 }; -int cs35l41_boost_config (struct device *dev,struct regmap *regmap,int boost_ind, -int boost_cap,int boost_ipk) +static int cs35l41_boost_config (struct device *dev,struct regmap *regmap,int boost_ind, +int boost_cap,int boost_ipk) {unsigned char bst_lbst_val, bst_cbst_range, bst_ipk_scaled;int ret;
@@ -1040,7 +1040,6 @@ int cs35l41_boost_config(struct device *dev, struct regmap *regmap, int boost_inreturn 0 ; } -EXPORT_SYMBOL_GPL (cs35l41_boost_config);static const struct reg_sequence cs35l41_safe_to_reset[] = { {0x00000040 ,0x00000055 },
sound/soc/codecs/cs35l41.c +37 -12
104 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v2 20/20 ASoC: cs35l41: Document CS35l41 External Boost
In reply to Lucas TanureFrom: David Rhodes <[email protected]>
Document external boost feature on CS35L41
--- .../bindings/sound/cirrus,cs35l41.yaml | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/sound/cirrus,cs35l41.yaml +41 -3
@@ -75,6 +75,19 @@ properties: maximum: 3 default: 2 + cirrus,boost-type: + description: + Configures the type of Boost being used. + Internal boost requires boost-peak-milliamp, boost-ind-nanohenry and + boost-cap-microfarad. + External Boost must have GPIO1 as GPIO output. GPIO1 will be set high to + enable boost voltage. + 0 = Internal Boost + 1 = External Boost + $ref: "/schemas/types.yaml#/definitions/uint32" + minimum: 0 + maximum: 1 + cirrus,gpio1-polarity-invert: description: Boolean which specifies whether the GPIO1
@@ -131,9 +144,32 @@ required: - compatible - reg - "#sound-dai-cells" - - cirrus,boost-peak-milliamp - - cirrus,boost-ind-nanohenry - - cirrus,boost-cap-microfarad + +allOf: + - if: + properties: + cirrus,boost-type: + contains: + const: 0 + + then: + required: + - cirrus,boost-peak-milliamp + - cirrus,boost-ind-nanohenry + - cirrus,boost-cap-microfarad + + - if: + properties: + cirrus,boost-type: + contains: + const: 1 + + then: + required: + - cirrus,gpio1-output-enable + properties: + cirrus,gpio1-src-select: + const: 1 additionalProperties: false
@@ -150,6 +186,8 @@ examples: VA-supply = <&dummy_vreg>; VP-supply = <&dummy_vreg>; reset-gpios = <&gpio 110 0>; + + cirrus,boost-type = <0>; cirrus,boost-peak-milliamp = <4500>; cirrus,boost-ind-nanohenry = <1000>; cirrus,boost-cap-microfarad = <15>;
Signature · 1 line
2.35.1
Quoted 32 lines · Lucas Tanure
Move the support for CS35L41 external boost to its shared library for ASoC use.
This move resulted incs35l41_hda_reg_sequencebeing removed, and its steps were broken down into regmap writes or functions from the library. And hardware configuration struct was unified for its use in the shared lib.
While at it, some minor bugs were found and fixed it.v2 changelog:
- Instead of removing the log, playback actions will log the last regmap access.
- Documentation patch with the correct subject line and fixed bug reported by Rob Herring on the provided example.Previous versions:
v1: https://lkml.org/lkml/2022/3/3/759David Rhodes (2):
ASoC: cs35l41: Fix GPIO2 configuration
ASoC: cs35l41: Document CS35l41 External BoostLucas Tanure (18):
ASoC: cs35l41: Fix max number of TX channels
ASoC: cs35l41: Fix DSP mbox start command and global enable order
ASoC: cs35l41: Remove unnecessary param
sound: cs35l41: Unify hardware configuration
sound: cs35l41: Checkhw_configbefore using it
sound: cs35l41: Movecs35l41_gpio_configto shared lib
hda: cs35l41: Fix I2S params comments
hda: cs35l41: Always configure the DAI
hda: cs35l41: Add Boost type flag
hda: cs35l41: Put the device into safe mode for external boost
Quoted 8 lines
hda: cs35l41: Mute the device before shutdown
sound: cs35l41: Enable Internal Boost in shared lib
hda: cs35l41: Move boost config to initialization code
hda: cs35l41: Removecs35l41_hda_reg_sequencestruct
hda: cs35l41: Reorganize log for playback actions
hda: cs35l41: Handle all external boost setups the same way
hda: cs35l41: Move external boost handling to lib for ASoC use
ASoC: cs35l41: Support external boost
Through a quick glance, the code changes look OK in general. But please correct the subject prefix. For non-ASoC patches (that begin with either "hda" or "sound" in this patch set) should be with "ALSA: hda: xxx" or such.
Also, although I respect the spirit of Haiku, the patch logs could be a bit more verbose and descriptive, and the texts can be folded at the right column. Some patch descriptions are too short, e.g. patch 15 doesn't mention about the new usleep_range() addition in the code.
thanks,
Takashi
Mark Brown
maintainerRe: (subset) [PATCH v2 00/20] Support external boost at CS35l41 ASoC driver
In reply to Lucas TanureQuoted 9 lines · Lucas Tanure
Move the support for CS35L41 external boost to its shared library for ASoC use.
This move resulted incs35l41_hda_reg_sequencebeing removed, and its steps were broken down into regmap writes or functions from the library. And hardware configuration struct was unified for its use in the shared lib.
While at it, some minor bugs were found and fixed it.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus
Thanks!
[02/20] ASoC: cs35l41: Fix max number of TX channels
commit: 16639d39bdf577168d3fe34315917a94365c8d19
[03/20] ASoC: cs35l41: Fix DSP mbox start command and global enable order
commit: 5e02fb590e83684f63217f93a9cdeabd6a925f9c[04/20] ASoC: cs35l41: Remove unnecessary param
(no commit info)
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark