samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: codecs: bolero: Keep track of lpass core votes"

Browse Source
This commit is contained in:
qctecmdr
2019-07-24 00:28:26 -07:00
committed by Gerrit - the friendly Code Review server
parent 0965ec588f ac555db98e
commit f4e4c55412
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
asoc/codecs/bolero/bolero-cdc.c
View File

@@ -960,9 +960,13 @@ static int bolero_probe(struct platform_device *pdev)
priv->plat_data.update_wcd_event = bolero_cdc_update_wcd_event; priv->plat_data.update_wcd_event = bolero_cdc_update_wcd_event;
priv->plat_data.register_notifier = bolero_cdc_register_notifier; priv->plat_data.register_notifier = bolero_cdc_register_notifier;
priv->core_hw_vote_count = 0;
priv->core_audio_vote_count = 0;
dev_set_drvdata(&pdev->dev, priv); dev_set_drvdata(&pdev->dev, priv);
mutex_init(&priv->io_lock); mutex_init(&priv->io_lock);
mutex_init(&priv->clk_lock); mutex_init(&priv->clk_lock);
mutex_init(&priv->vote_lock);
INIT_WORK(&priv->bolero_add_child_devices_work, INIT_WORK(&priv->bolero_add_child_devices_work,
bolero_add_child_devices); bolero_add_child_devices);
schedule_work(&priv->bolero_add_child_devices_work); schedule_work(&priv->bolero_add_child_devices_work);
@@ -1002,6 +1006,7 @@ static int bolero_remove(struct platform_device *pdev)
of_platform_depopulate(&pdev->dev); of_platform_depopulate(&pdev->dev);
mutex_destroy(&priv->io_lock); mutex_destroy(&priv->io_lock);
mutex_destroy(&priv->clk_lock); mutex_destroy(&priv->clk_lock);
mutex_destroy(&priv->vote_lock);
return 0; return 0;
} }
@@ -1015,21 +1020,35 @@ int bolero_runtime_resume(struct device *dev)
return 0; return 0;
} }
ret = clk_prepare_enable(priv->lpass_core_hw_vote); mutex_lock(&priv->vote_lock);
if (ret < 0) if (priv->core_hw_vote_count == 0) {
dev_err(dev, "%s:lpass core hw enable failed\n", ret = clk_prepare_enable(priv->lpass_core_hw_vote);
__func__); if (ret < 0) {
dev_err(dev, "%s:lpass core hw enable failed\n",
__func__);
goto audio_vote;
}
}
priv->core_hw_vote_count++;
audio_vote:
if (priv->lpass_audio_hw_vote == NULL) { if (priv->lpass_audio_hw_vote == NULL) {
dev_dbg(dev, "%s: Invalid lpass audio hw node\n", __func__); dev_dbg(dev, "%s: Invalid lpass audio hw node\n", __func__);
return 0; goto done;
} }
ret = clk_prepare_enable(priv->lpass_audio_hw_vote); if (priv->core_audio_vote_count == 0) {
if (ret < 0) ret = clk_prepare_enable(priv->lpass_audio_hw_vote);
dev_err(dev, "%s:lpass audio hw enable failed\n", if (ret < 0) {
__func__); dev_err(dev, "%s:lpass audio hw enable failed\n",
__func__);
goto done;
}
}
priv->core_audio_vote_count++;
done:
mutex_unlock(&priv->vote_lock);
pm_runtime_set_autosuspend_delay(priv->dev, BOLERO_AUTO_SUSPEND_DELAY); pm_runtime_set_autosuspend_delay(priv->dev, BOLERO_AUTO_SUSPEND_DELAY);
return 0; return 0;
} }
@@ -1039,17 +1058,28 @@ int bolero_runtime_suspend(struct device *dev)
{ {
struct bolero_priv *priv = dev_get_drvdata(dev->parent); struct bolero_priv *priv = dev_get_drvdata(dev->parent);
if (priv->lpass_core_hw_vote != NULL) mutex_lock(&priv->vote_lock);
clk_disable_unprepare(priv->lpass_core_hw_vote); if (priv->lpass_core_hw_vote != NULL) {
else if (--priv->core_hw_vote_count == 0)
clk_disable_unprepare(priv->lpass_core_hw_vote);
if (priv->core_hw_vote_count < 0)
priv->core_hw_vote_count = 0;
} else {
dev_dbg(dev, "%s: Invalid lpass core hw node\n", dev_dbg(dev, "%s: Invalid lpass core hw node\n",
__func__); __func__);
}
if (priv->lpass_audio_hw_vote != NULL) if (priv->lpass_audio_hw_vote != NULL) {
clk_disable_unprepare(priv->lpass_audio_hw_vote); if (--priv->core_audio_vote_count == 0)
else clk_disable_unprepare(priv->lpass_audio_hw_vote);
if (priv->core_audio_vote_count < 0)
priv->core_audio_vote_count = 0;
} else {
dev_dbg(dev, "%s: Invalid lpass audio hw node\n", dev_dbg(dev, "%s: Invalid lpass audio hw node\n",
__func__); __func__);
}
mutex_unlock(&priv->vote_lock);
return 0; return 0;
} }
EXPORT_SYMBOL(bolero_runtime_suspend); EXPORT_SYMBOL(bolero_runtime_suspend);

3
asoc/codecs/bolero/internal.h
View File

@@ -46,6 +46,7 @@ struct bolero_priv {
struct regmap *regmap; struct regmap *regmap;
struct mutex io_lock; struct mutex io_lock;
struct mutex clk_lock; struct mutex clk_lock;
struct mutex vote_lock;
bool va_without_decimation; bool va_without_decimation;
bool macros_supported[MAX_MACRO]; bool macros_supported[MAX_MACRO];
bool dev_up; bool dev_up;
@@ -60,6 +61,8 @@ struct bolero_priv {
u32 version; u32 version;
struct clk *lpass_core_hw_vote; struct clk *lpass_core_hw_vote;
struct clk *lpass_audio_hw_vote; struct clk *lpass_audio_hw_vote;
int core_hw_vote_count;
int core_audio_vote_count;
/* Entry for version info */ /* Entry for version info */
struct snd_info_entry *entry; struct snd_info_entry *entry;