Skip to content

L
linux
Commit a5adbfb6 authored by Stefan Binding's avatar Stefan Binding Committed by Takashi Iwai
Browse files
Options

ALSA: hda: cs35l41: Move Play and Pause into separate functions 

This allows play and pause to be called from multiple places,
which is necessary for system suspend and resume.
Signed-off-by: default avatarStefan Binding <sbinding@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230721151816.2080453-7-sbinding@opensource.cirrus.comSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f2a58481
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 52 deletions
sound/pci/hda/cs35l41_hda.c
View file @ a5adbfb6
...@@ -483,63 +483,103 @@ static void cs35l41_irq_release(struct cs35l41_hda *cs35l41) ...@@ -483,63 +483,103 @@ static void cs35l41_irq_release(struct cs35l41_hda *cs35l41)
cs35l41->irq_errors = 0; cs35l41->irq_errors = 0;
} }
static void cs35l41_hda_playback_hook(struct device *dev, int action) static void cs35l41_hda_play_start(struct device *dev)
{ {
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev); struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
struct regmap *reg = cs35l41->regmap; struct regmap *reg = cs35l41->regmap;
int ret = 0;
switch (action) { dev_dbg(dev, "Play (Start)\n");
case HDA_GEN_PCM_ACT_OPEN:
pm_runtime_get_sync(dev); if (cs35l41->playback_started) {
mutex_lock(&cs35l41->fw_mutex); dev_dbg(dev, "Playback already started.");
return;
}
cs35l41->playback_started = true; cs35l41->playback_started = true;
if (cs35l41->firmware_running) { if (cs35l41->firmware_running) {
regmap_multi_reg_write(reg, cs35l41_hda_config_dsp, regmap_multi_reg_write(reg, cs35l41_hda_config_dsp,
ARRAY_SIZE(cs35l41_hda_config_dsp)); ARRAY_SIZE(cs35l41_hda_config_dsp));
regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2, regmap_update_bits(reg, CS35L41_PWR_CTRL2,
CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK, CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,
1 << CS35L41_VMON_EN_SHIFT | 1 << CS35L41_IMON_EN_SHIFT); 1 << CS35L41_VMON_EN_SHIFT | 1 << CS35L41_IMON_EN_SHIFT);
cs35l41_set_cspl_mbox_cmd(cs35l41->dev, cs35l41->regmap, cs35l41_set_cspl_mbox_cmd(cs35l41->dev, reg, CSPL_MBOX_CMD_RESUME);
CSPL_MBOX_CMD_RESUME);
} else { } else {
regmap_multi_reg_write(reg, cs35l41_hda_config, regmap_multi_reg_write(reg, cs35l41_hda_config, ARRAY_SIZE(cs35l41_hda_config));
ARRAY_SIZE(cs35l41_hda_config));
} }
ret = regmap_update_bits(reg, CS35L41_PWR_CTRL2, regmap_update_bits(reg, CS35L41_PWR_CTRL2, CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);
CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);
if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST) if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST)
regmap_write(reg, CS35L41_GPIO1_CTRL1, 0x00008001); regmap_write(reg, CS35L41_GPIO1_CTRL1, 0x00008001);
}
static void cs35l41_hda_play_done(struct device *dev)
{
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
struct regmap *reg = cs35l41->regmap;
dev_dbg(dev, "Play (Complete)\n");
cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1, NULL,
cs35l41->firmware_running);
}
static void cs35l41_hda_pause_start(struct device *dev)
{
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
struct regmap *reg = cs35l41->regmap;
dev_dbg(dev, "Pause (Start)\n");
regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute));
cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0, NULL,
cs35l41->firmware_running);
}
static void cs35l41_hda_pause_done(struct device *dev)
{
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
struct regmap *reg = cs35l41->regmap;
dev_dbg(dev, "Pause (Complete)\n");
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);
if (cs35l41->firmware_running) {
cs35l41_set_cspl_mbox_cmd(dev, reg, CSPL_MBOX_CMD_PAUSE);
regmap_update_bits(reg, CS35L41_PWR_CTRL2,
CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,
0 << CS35L41_VMON_EN_SHIFT | 0 << CS35L41_IMON_EN_SHIFT);
}
cs35l41_irq_release(cs35l41);
cs35l41->playback_started = false;
}
static void cs35l41_hda_playback_hook(struct device *dev, int action)
{
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
switch (action) {
case HDA_GEN_PCM_ACT_OPEN:
pm_runtime_get_sync(dev);
mutex_lock(&cs35l41->fw_mutex);
cs35l41_hda_play_start(dev);
mutex_unlock(&cs35l41->fw_mutex); mutex_unlock(&cs35l41->fw_mutex);
break; break;
case HDA_GEN_PCM_ACT_PREPARE: case HDA_GEN_PCM_ACT_PREPARE:
mutex_lock(&cs35l41->fw_mutex); mutex_lock(&cs35l41->fw_mutex);
ret = cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1, NULL, cs35l41_hda_play_done(dev);
cs35l41->firmware_running);
mutex_unlock(&cs35l41->fw_mutex); mutex_unlock(&cs35l41->fw_mutex);
break; break;
case HDA_GEN_PCM_ACT_CLEANUP: case HDA_GEN_PCM_ACT_CLEANUP:
mutex_lock(&cs35l41->fw_mutex); mutex_lock(&cs35l41->fw_mutex);
regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute)); cs35l41_hda_pause_start(dev);
ret = cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0, NULL,
cs35l41->firmware_running);
mutex_unlock(&cs35l41->fw_mutex); mutex_unlock(&cs35l41->fw_mutex);
break; break;
case HDA_GEN_PCM_ACT_CLOSE: case HDA_GEN_PCM_ACT_CLOSE:
mutex_lock(&cs35l41->fw_mutex); mutex_lock(&cs35l41->fw_mutex);
ret = regmap_update_bits(reg, CS35L41_PWR_CTRL2, cs35l41_hda_pause_done(dev);
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);
if (cs35l41->firmware_running) {
cs35l41_set_cspl_mbox_cmd(cs35l41->dev, cs35l41->regmap,
CSPL_MBOX_CMD_PAUSE);
regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,
0 << CS35L41_VMON_EN_SHIFT | 0 << CS35L41_IMON_EN_SHIFT);
}
cs35l41_irq_release(cs35l41);
cs35l41->playback_started = false;
mutex_unlock(&cs35l41->fw_mutex); mutex_unlock(&cs35l41->fw_mutex);
pm_runtime_mark_last_busy(dev); pm_runtime_mark_last_busy(dev);
...@@ -549,9 +589,6 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action) ...@@ -549,9 +589,6 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
dev_warn(cs35l41->dev, "Playback action not supported: %d\n", action); dev_warn(cs35l41->dev, "Playback action not supported: %d\n", action);
break; break;
} }
if (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, static int cs35l41_hda_channel_map(struct device *dev, unsigned int tx_num, unsigned int *tx_slot,
...@@ -703,18 +740,8 @@ static int cs35l41_runtime_suspend(struct device *dev) ...@@ -703,18 +740,8 @@ static int cs35l41_runtime_suspend(struct device *dev)
mutex_lock(&cs35l41->fw_mutex); mutex_lock(&cs35l41->fw_mutex);
if (cs35l41->playback_started) { if (cs35l41->playback_started) {
regmap_multi_reg_write(cs35l41->regmap, cs35l41_hda_mute, cs35l41_hda_pause_start(dev);
ARRAY_SIZE(cs35l41_hda_mute)); cs35l41_hda_pause_done(dev);
cs35l41_global_enable(cs35l41->dev, cs35l41->regmap, cs35l41->hw_cfg.bst_type, 0,
NULL, cs35l41->firmware_running);
regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
CS35L41_AMP_EN_MASK, 0 << CS35L41_AMP_EN_SHIFT);
if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST)
regmap_write(cs35l41->regmap, CS35L41_GPIO1_CTRL1, 0x00000001);
regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,
0 << CS35L41_VMON_EN_SHIFT | 0 << CS35L41_IMON_EN_SHIFT);
cs35l41->playback_started = false;
} }
if (cs35l41->firmware_running) { if (cs35l41->firmware_running) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7