| Message ID | 1420107825-28506-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7a81140b0ead01fcb27e6167b1015b06c36acbd0 |
| Headers | show |
On 01/01/2015 12:23 PM, Lars-Peter Clausen wrote: > To work properly snd_soc_dapm_ignore_suspend() needs to be called on > endpoint widgets. In this case those are the board level Speaker and > Headphone widgets and not the CODEC output widgets that are connected to > them. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > sound/soc/intel/byt-rt5640.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) To both: Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
On Thu, Jan 01, 2015 at 11:23:44AM +0100, Lars-Peter Clausen wrote: > To work properly snd_soc_dapm_ignore_suspend() needs to be called on > endpoint widgets. In this case those are the board level Speaker and > Headphone widgets and not the CODEC output widgets that are connected to > them. Applied both, thanks.
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c index 0cba783..a51856e 100644 --- a/sound/soc/intel/byt-rt5640.c +++ b/sound/soc/intel/byt-rt5640.c @@ -171,13 +171,8 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) return ret; } - snd_soc_dapm_ignore_suspend(dapm, "HPOL"); - snd_soc_dapm_ignore_suspend(dapm, "HPOR"); - - snd_soc_dapm_ignore_suspend(dapm, "SPOLP"); - snd_soc_dapm_ignore_suspend(dapm, "SPOLN"); - snd_soc_dapm_ignore_suspend(dapm, "SPORP"); - snd_soc_dapm_ignore_suspend(dapm, "SPORN"); + snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone"); + snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker"); return ret; }
To work properly snd_soc_dapm_ignore_suspend() needs to be called on endpoint widgets. In this case those are the board level Speaker and Headphone widgets and not the CODEC output widgets that are connected to them. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- sound/soc/intel/byt-rt5640.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)