iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda: cs35l41: Remove cs35l41_hda_reg_sequence struct

Browse Source 
Remove cs35l41_hd_reg_sequence as it adds a layer of flexibility not needed.
As cs35l41_hda_(start/stop)_bst is a single register, it can be replaced by
regmap_update_bits with usleep_range to wait for the same 3000us that
reg_sequence had.

Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220413083728.10730-12-tanureal@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lucas Tanure 2022-04-13 09:37:23 +01:00 committed by Takashi Iwai
parent 5fdb68a761
commit fabcf7f12b
2 changed files with 33 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
sound/pci/hda/cs35l41_hda.c
View File

@ -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 i
if (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);

14
sound/pci/hda/cs35l41_hda.h
View File

@ -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;