[PATCH 1/1] ASoC: Fix the power update function for snd_soc_dapm_value_mux

[PATCH 1/1] ASoC: Fix the power update function for snd_soc_dapm_value_mux

[Peter Ujfalusi]

Modify the check for the mux type to also handle the
snd_soc_dapm_value_mux type in a same way as the snd_soc_dapm_mux.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
---
 sound/soc/soc-dapm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 493a4e8..a2f1da8 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -720,7 +720,8 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
 	struct snd_soc_dapm_path *path;
 	int found = 0;
 
-	if (widget->id != snd_soc_dapm_mux)
+	if (widget->id != snd_soc_dapm_mux &&
+	    widget->id != snd_soc_dapm_value_mux)
 		return -ENODEV;
 
 	if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))
-- 
1.6.1

[PATCH 0/1] ASoC patch on top of linux-omap 2.6.29-rc1 (TWL4030 related) - try2

[Peter Ujfalusi]

Hello,

This patch has been sent after 29-rc1 to ALSA devel, it is already in Takashi's
tree and will go upstream as soon as possible.

Somehow I have left out this from the soc_value_enum type merge to the soc_enum
series, which kind of renders the twl4030 codec driver to not to update the
value_enum types. In other words: without this patch the twl4030 codec is not
working.

The patch applies cleanly to the head of linux-omap tree.

BTW: the twl4030 codec driver has been changed dramatically, meaning that
most (shall I say all?) of the platforms using it need to be updated to define
the correct output and input pins.
The playback and capture path now implemented with DAPM, so without the correct
definitions the audio is most likely will not going to work.
On the bright side: all possible playback and capture routing combination can be
configured (except for the pre-DAC routing, but I can send a sample code,
which does it in the board file).

---
Peter Ujfalusi (1):
  ASoC: Fix the power update function for snd_soc_dapm_value_mux

 sound/soc/soc-dapm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

[PATCH 1/1] ASoC: Fix the power update function for snd_soc_dapm_value_mux

[Peter Ujfalusi]

Modify the check for the mux type to also handle the
snd_soc_dapm_value_mux type in a same way as the snd_soc_dapm_mux.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/soc-dapm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 493a4e8..a2f1da8 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -720,7 +720,8 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
 	struct snd_soc_dapm_path *path;
 	int found = 0;
 
-	if (widget->id != snd_soc_dapm_mux)
+	if (widget->id != snd_soc_dapm_mux &&
+	    widget->id != snd_soc_dapm_value_mux)
 		return -ENODEV;
 
 	if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))
-- 
1.6.1

Re: [PATCH 1/1] ASoC: Fix the power update function for snd_soc_dapm_value_mux

[Tony Lindgren]

* Peter Ujfalusi <peter.ujfalusi@nokia.com> [090116 09:49]:
> Modify the check for the mux type to also handle the
> snd_soc_dapm_value_mux type in a same way as the snd_soc_dapm_mux.

Thanks, pushed to l-o tree to wait for it to fall down from mainline.

Tony


> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  sound/soc/soc-dapm.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
> index 493a4e8..a2f1da8 100644
> --- a/sound/soc/soc-dapm.c
> +++ b/sound/soc/soc-dapm.c
> @@ -720,7 +720,8 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
>  	struct snd_soc_dapm_path *path;
>  	int found = 0;
>  
> -	if (widget->id != snd_soc_dapm_mux)
> +	if (widget->id != snd_soc_dapm_mux &&
> +	    widget->id != snd_soc_dapm_value_mux)
>  		return -ENODEV;
>  
>  	if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))
> -- 
> 1.6.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/1] ASoC: Fix the power update function for snd_soc_dapm_value_mux

[Takashi Iwai]

At Fri, 16 Jan 2009 09:48:06 +0200,
Peter Ujfalusi wrote:
> 
> Modify the check for the mux type to also handle the
> snd_soc_dapm_value_mux type in a same way as the snd_soc_dapm_mux.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

FYI, it's already in Linus tree.


thanks,

Takashi

> ---
>  sound/soc/soc-dapm.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
> index 493a4e8..a2f1da8 100644
> --- a/sound/soc/soc-dapm.c
> +++ b/sound/soc/soc-dapm.c
> @@ -720,7 +720,8 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
>  	struct snd_soc_dapm_path *path;
>  	int found = 0;
>  
> -	if (widget->id != snd_soc_dapm_mux)
> +	if (widget->id != snd_soc_dapm_mux &&
> +	    widget->id != snd_soc_dapm_value_mux)
>  		return -ENODEV;
>  
>  	if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))
> -- 
> 1.6.1
> 

Re: [PATCH 1/1] ASoC: Fix the power update function for snd_soc_dapm_value_mux

[Tony Lindgren]

* Takashi Iwai <tiwai@suse.de> [090116 11:16]:
> At Fri, 16 Jan 2009 09:48:06 +0200,
> Peter Ujfalusi wrote:
> > 
> > Modify the check for the mux type to also handle the
> > snd_soc_dapm_value_mux type in a same way as the snd_soc_dapm_mux.
> > 
> > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> 
> FYI, it's already in Linus tree.

Thanks, will get it on the next merge then.

Tony

> 
> 
> thanks,
> 
> Takashi
> 
> > ---
> >  sound/soc/soc-dapm.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> > 
> > diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
> > index 493a4e8..a2f1da8 100644
> > --- a/sound/soc/soc-dapm.c
> > +++ b/sound/soc/soc-dapm.c
> > @@ -720,7 +720,8 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
> >  	struct snd_soc_dapm_path *path;
> >  	int found = 0;
> >  
> > -	if (widget->id != snd_soc_dapm_mux)
> > +	if (widget->id != snd_soc_dapm_mux &&
> > +	    widget->id != snd_soc_dapm_value_mux)
> >  		return -ENODEV;
> >  
> >  	if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))
> > -- 
> > 1.6.1
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html