[PATCH 1/2] ASoC: byt-rt5640: Fix snd_soc_dapm_ignore_suspend() calls

[PATCH 1/2] ASoC: byt-rt5640: Fix snd_soc_dapm_ignore_suspend() calls

[Lars-Peter Clausen]

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(-)

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;
 }
-- 
1.8.0

[PATCH 2/2] ASoC: byt-rt5640: Register microphone routes with the card DAPM context

[Lars-Peter Clausen]

Board level DAPM elements should be registered with the card's DAPM context
rather than the CODEC's DAPM context.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/intel/byt-rt5640.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index a51856e..354eaad 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -132,7 +132,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
 {
 	int ret;
 	struct snd_soc_codec *codec = runtime->codec;
-	struct snd_soc_dapm_context *dapm = &codec->dapm;
 	struct snd_soc_card *card = runtime->card;
 	const struct snd_soc_dapm_route *custom_map;
 	int num_routes;
@@ -161,7 +160,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
 		num_routes = ARRAY_SIZE(byt_rt5640_intmic_dmic1_map);
 	}
 
-	ret = snd_soc_dapm_add_routes(dapm, custom_map, num_routes);
+	ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes);
 	if (ret)
 		return ret;
 
-- 
1.8.0

Re: [PATCH 1/2] ASoC: byt-rt5640: Fix snd_soc_dapm_ignore_suspend() calls

[Jarkko Nikula]

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>

Re: [PATCH 1/2] ASoC: byt-rt5640: Fix snd_soc_dapm_ignore_suspend() calls

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 316 bytes --]

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.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]