[alsa-devel] [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes

[Grazvydas Ignotas]

On Sun, Nov 8, 2009 at 10:31 PM, Liam Girdwood <lrg at 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 at 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 at slimlogic.co.uk>

I wonder if this could go in as a fix, Pandora will have no working
sound playback in .32 without this.