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

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

[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.

---
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>
---
 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 0/1] ASoC patch on top of linux-omap 2.6.29-rc1 (TWL4030 related)

[Peter Ujfalusi]

Hmm, should I take the patch from Takashi's tree (with his sign-off) and
resend it?
This patch is the one that I have sent to alsa-devel...

-- 
Péter

On Friday 16 January 2009 08:14:52 Peter Ujfalusi wrote:
> 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.
>
> ---
> 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(-)

--
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 0/1] ASoC patch on top of linux-omap 2.6.29-rc1 (TWL4030 related)

[Tony Lindgren]

* Peter Ujfalusi <peter.ujfalusi@nokia.com> [090116 08:21]:
> Hmm, should I take the patch from Takashi's tree (with his sign-off) and
> resend it?
> This patch is the one that I have sent to alsa-devel...

In general that would be best, as then I know it's been acked and on
it's way to the mainline kernel via alsa already. Meaning it's safe
for me to apply to linux-omap without increasing the diff to mainline
kernel.

Tony

> 
> -- 
> Péter
> 
> On Friday 16 January 2009 08:14:52 Peter Ujfalusi wrote:
> > 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.
> >
> > ---
> > 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(-)
> 
> --
> 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
--
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 0/1] ASoC patch on top of linux-omap 2.6.29-rc1 (TWL4030 related)

[Mark Brown]

On Fri, Jan 16, 2009 at 09:27:12AM +0200, Tony Lindgren wrote:

> In general that would be best, as then I know it's been acked and on
> it's way to the mainline kernel via alsa already. Meaning it's safe
> for me to apply to linux-omap without increasing the diff to mainline
> kernel.

Linus has already merged it, FWIW.