ASoC: Take a pm_runtime reference on DAPM devices that are enabled
Subsystems (3)
PATCH 1/2 ASoC: Take a pm_runtime reference on DAPM devices that are enabled
As for PCMs take a runtime power management reference to devices that are in a non-off bias, avoiding the need to do this in individual drivers.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-dapm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
sound/soc/soc-dapm.c +7 -0
@@ -39,6 +39,7 @@#include <linux/platform_device.h> #include <linux/jiffies.h> #include <linux/debugfs.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -1213,6 +1214,9 @@ static void dapm_pre_sequence_async(void *data, async_cookie_t cookie)/* If we're off and we're not supposed to be go into STANDBY */ if (d->bias_level ==SND_SOC_BIAS_OFF && d->target_bias_level !=SND_SOC_BIAS_OFF ) { +if (d->dev) +pm_runtime_get_sync (d->dev); + ret =snd_soc_dapm_set_bias_level (d,SND_SOC_BIAS_STANDBY );if (ret !=0 ) dev_err(d->dev,
@@ -1252,6 +1256,9 @@ static void dapm_post_sequence_async(void *data, async_cookie_t cookie) ret =snd_soc_dapm_set_bias_level (d,SND_SOC_BIAS_OFF );if (ret !=0 )dev_err (d->dev,"Failed to turn off bias: %d\n" , ret); + +if (d->dev) +pm_runtime_put_sync (d->dev); }/* If we just powered up then move to active bias */
Signature · 1 line
1.7.7.3
PATCH 2/2 ASoC: Rely on core enabling the wm8994 with runtime PM
No need to do this in the driver now.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
sound/soc/codecs/wm8994.c +1 -6
@@ -2089,8 +2089,6 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_STANDBY :if (codec->dapm.bias_level ==SND_SOC_BIAS_OFF ) { -pm_runtime_get_sync (codec->dev); -switch (control->type) {case WM8994 :if (wm8994->revision <4 ) {
@@ -2157,11 +2155,8 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,break ;case SND_SOC_BIAS_OFF : -if (codec->dapm.bias_level ==SND_SOC_BIAS_STANDBY ) { +if (codec->dapm.bias_level ==SND_SOC_BIAS_STANDBY ) wm8994->cur_fw =NULL ; - -pm_runtime_put (codec->dev); - }break ; } codec->dapm.bias_level = level;
Signature · 1 line
1.7.7.3