* [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes
@ 2009-11-07 21:16 Grazvydas Ignotas
2009-11-08 20:31 ` Liam Girdwood
0 siblings, 1 reply; 5+ messages in thread
From: Grazvydas Ignotas @ 2009-11-07 21:16 UTC (permalink / raw)
To: alsa-devel; +Cc: Grazvydas Ignotas
A while ago TWL4030 had it's playback stream name changed, but
pandora needs it for it's playback path. Update to correct stream
name so that playback works again.
Also mark VIBRA output as not connected.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
---
sound/soc/omap/omap3pandora.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index ad219aa..0cd06f5 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -134,7 +134,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,
* |P| <--- TWL4030 <--------- Line In and MICs
*/
static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
- SND_SOC_DAPM_DAC("PCM DAC", "Playback", SND_SOC_NOPM, 0, 0),
+ SND_SOC_DAPM_DAC("PCM DAC", "HiFi Playback", SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM,
0, 0, NULL, 0, omap3pandora_hp_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -181,6 +181,7 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec)
snd_soc_dapm_nc_pin(codec, "CARKITR");
snd_soc_dapm_nc_pin(codec, "HFL");
snd_soc_dapm_nc_pin(codec, "HFR");
+ snd_soc_dapm_nc_pin(codec, "VIBRA");
ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets,
ARRAY_SIZE(omap3pandora_out_dapm_widgets));
--
1.5.6.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes
2009-11-07 21:16 [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes Grazvydas Ignotas
@ 2009-11-08 20:31 ` Liam Girdwood
2009-11-18 10:12 ` Grazvydas Ignotas
0 siblings, 1 reply; 5+ messages in thread
From: Liam Girdwood @ 2009-11-08 20:31 UTC (permalink / raw)
To: Grazvydas Ignotas; +Cc: alsa-devel, Mark Brown
On Sat, 2009-11-07 at 23:16 +0200, Grazvydas Ignotas wrote:
> A while ago TWL4030 had it's playback stream name changed, but
> pandora needs it for it's playback path. Update to correct stream
> name so that playback works again.
>
> Also mark VIBRA output as not connected.
>
> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
> ---
> sound/soc/omap/omap3pandora.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
> index ad219aa..0cd06f5 100644
> --- a/sound/soc/omap/omap3pandora.c
> +++ b/sound/soc/omap/omap3pandora.c
> @@ -134,7 +134,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,
> * |P| <--- TWL4030 <--------- Line In and MICs
> */
> static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
> - SND_SOC_DAPM_DAC("PCM DAC", "Playback", SND_SOC_NOPM, 0, 0),
> + SND_SOC_DAPM_DAC("PCM DAC", "HiFi Playback", SND_SOC_NOPM, 0, 0),
> SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM,
> 0, 0, NULL, 0, omap3pandora_hp_event,
> SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
> @@ -181,6 +181,7 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec)
> snd_soc_dapm_nc_pin(codec, "CARKITR");
> snd_soc_dapm_nc_pin(codec, "HFL");
> snd_soc_dapm_nc_pin(codec, "HFR");
> + snd_soc_dapm_nc_pin(codec, "VIBRA");
>
> ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets,
> ARRAY_SIZE(omap3pandora_out_dapm_widgets));
Acked-by:Liam Girdwood <lrg@slimlogic.co.uk>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes
2009-11-08 20:31 ` Liam Girdwood
@ 2009-11-18 10:12 ` Grazvydas Ignotas
2009-11-18 10:27 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Grazvydas Ignotas @ 2009-11-18 10:12 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, Liam Girdwood
On Sun, Nov 8, 2009 at 10:31 PM, Liam Girdwood <lrg@slimlogic.co.uk> wrote:
> On Sat, 2009-11-07 at 23:16 +0200, Grazvydas Ignotas wrote:
>> A while ago TWL4030 had it's playback stream name changed, but
>> pandora needs it for it's playback path. Update to correct stream
>> name so that playback works again.
>>
>> Also mark VIBRA output as not connected.
>>
>> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
>> ---
>> sound/soc/omap/omap3pandora.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
>> index ad219aa..0cd06f5 100644
>> --- a/sound/soc/omap/omap3pandora.c
>> +++ b/sound/soc/omap/omap3pandora.c
>> @@ -134,7 +134,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,
>> * |P| <--- TWL4030 <--------- Line In and MICs
>> */
>> static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
>> - SND_SOC_DAPM_DAC("PCM DAC", "Playback", SND_SOC_NOPM, 0, 0),
>> + SND_SOC_DAPM_DAC("PCM DAC", "HiFi Playback", SND_SOC_NOPM, 0, 0),
>> SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM,
>> 0, 0, NULL, 0, omap3pandora_hp_event,
>> SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
>> @@ -181,6 +181,7 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec)
>> snd_soc_dapm_nc_pin(codec, "CARKITR");
>> snd_soc_dapm_nc_pin(codec, "HFL");
>> snd_soc_dapm_nc_pin(codec, "HFR");
>> + snd_soc_dapm_nc_pin(codec, "VIBRA");
>>
>> ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets,
>> ARRAY_SIZE(omap3pandora_out_dapm_widgets));
>
> Acked-by:Liam Girdwood <lrg@slimlogic.co.uk>
I wonder if this could go in as a fix, Pandora will have no working
sound playback in .32 without this.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes
2009-11-18 10:12 ` Grazvydas Ignotas
@ 2009-11-18 10:27 ` Mark Brown
2009-11-18 13:17 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2009-11-18 10:27 UTC (permalink / raw)
To: Grazvydas Ignotas; +Cc: alsa-devel, Liam Girdwood
On Wed, Nov 18, 2009 at 12:12:38PM +0200, Grazvydas Ignotas wrote:
> I wonder if this could go in as a fix, Pandora will have no working
> sound playback in .32 without this.
I guess. Please do say when submitting patches if they are urgent bug
fixes, if you don't say anything the default assumption will be that
it's just a regular patch and can go in during the merge window.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes
2009-11-18 10:27 ` Mark Brown
@ 2009-11-18 13:17 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2009-11-18 13:17 UTC (permalink / raw)
To: Grazvydas Ignotas; +Cc: alsa-devel, Liam Girdwood
On Wed, Nov 18, 2009 at 10:27:46AM +0000, Mark Brown wrote:
> I guess. Please do say when submitting patches if they are urgent bug
> fixes, if you don't say anything the default assumption will be that
> it's just a regular patch and can go in during the merge window.
Further to this, please do always CC maintainers on patches - things
sent to the mailing lists only can easily get missed in amongst all the
other stuff.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-11-18 13:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-07 21:16 [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes Grazvydas Ignotas
2009-11-08 20:31 ` Liam Girdwood
2009-11-18 10:12 ` Grazvydas Ignotas
2009-11-18 10:27 ` Mark Brown
2009-11-18 13:17 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox