ALSA fixes for 2.6.29-rc3
Subsystems (3)
Linus,
please pull ALSA fixes for 2.6.29-rc3 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
containing only the following trivial fixes.
Thanks!
Takashi
===
Joerg Schirottke (1):
ALSA: hda - Add quirk for HP DV6700 laptop
Luke Yelavich (1):
ALSA: hda - add another MacBook Pro 4, 1 subsystem ID
Mark Brown (1):
ASoC: Fix null string usage with WM8753 DAIs
Misael Lopez Cruz (1):
ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver
Takashi Iwai (2):
ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs
ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n
--- sound/pci/hda/patch_conexant.c | 14 ++++++++++++-- sound/pci/hda/patch_realtek.c | 1 + sound/pci/hda/patch_sigmatel.c | 2 ++ sound/soc/codecs/wm8753.c | 9 ++++++++- sound/soc/omap/omap-mcbsp.c | 4 ++++ 5 files changed, 27 insertions(+), 3 deletions(-)
sound/pci/hda/patch_conexant.c +12 -2
@@ -347,6 +347,7 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol, &spec->cur_mux[adc_idx]); } +#ifdef CONFIG_SND_JACK static int conexant_add_jack (struct hda_codec *codec,hda_nid_t nid,int type) {
@@ -394,7 +395,6 @@ static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)static int conexant_init_jacks (struct hda_codec *codec) { -#ifdef CONFIG_SND_JACK struct conexant_spec *spec = codec->spec;int i;
@@ -422,10 +422,19 @@ static int conexant_init_jacks(struct hda_codec *codec) ++hv; } } -#endif return 0 ; } +#else +static inline void conexant_report_jack (struct hda_codec *codec,hda_nid_t nid) +{ +} + +static inline int conexant_init_jacks (struct hda_codec *codec) +{ +return 0 ; +} +#endif static int conexant_init (struct hda_codec *codec) {
@@ -1566,6 +1575,7 @@ static struct snd_pci_quirk cxt5047_cfg_tbl[] = {SND_PCI_QUIRK (0x103c ,0x30a5 ,"HP DV5200T/DV8000T" ,CXT5047_LAPTOP_HP ),SND_PCI_QUIRK (0x103c ,0x30b2 ,"HP DV2000T/DV3000T" ,CXT5047_LAPTOP ),SND_PCI_QUIRK (0x103c ,0x30b5 ,"HP DV2000Z" ,CXT5047_LAPTOP ), +SND_PCI_QUIRK (0x103c ,0x30cf ,"HP DV6700" ,CXT5047_LAPTOP ), SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD), {} };
sound/pci/hda/patch_realtek.c +1 -0
@@ -7018,6 +7018,7 @@ static int patch_alc882(struct hda_codec *codec)case 0x106b00a4 :/* MacbookPro4,1 */ case 0x106b2c00 :/* Macbook Pro rev3 */ case 0x106b3600 :/* Macbook 3.1 */ +case 0x106b3800 :/* MacbookPro4,1 - latter revision */ board_config =ALC885_MBP3 ;break ;default :
sound/pci/hda/patch_sigmatel.c +2 -0
@@ -2539,6 +2539,8 @@ static int stac92xx_build_pcms(struct hda_codec *codec) info->name ="STAC92xx Analog" ; info->stream[SNDRV_PCM_STREAM_PLAYBACK ] = stac92xx_pcm_analog_playback; + info->stream[SNDRV_PCM_STREAM_PLAYBACK ].nid = + spec->multiout.dac_nids[0 ]; info->stream[SNDRV_PCM_STREAM_CAPTURE ] = stac92xx_pcm_analog_capture; info->stream[SNDRV_PCM_STREAM_CAPTURE ].nid = spec->adc_nids[0 ]; info->stream[SNDRV_PCM_STREAM_CAPTURE ].substreams = spec->num_adcs;
sound/soc/codecs/wm8753.c +8 -1
@@ -1451,7 +1451,14 @@ static const struct snd_soc_dai wm8753_all_dai[] = { }, }; -struct snd_soc_dai wm8753_dai[2 ]; +struct snd_soc_dai wm8753_dai[] = { + { + .name ="WM8753 DAI 0" , + }, + { + .name ="WM8753 DAI 1" , + }, +};EXPORT_SYMBOL_GPL (wm8753_dai);static void wm8753_set_dai_mode (struct snd_soc_codec *codec,unsigned int mode)
sound/soc/omap/omap-mcbsp.c +4 -0
@@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, regs->spcr1 |=RINTM (3 ); regs->rcr2 |=RFIG ; regs->xcr2 |=XFIG ; +if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) { + regs->xccr =DXENDLY (1 ) |XDMAEN ; + regs->rccr =RFULL_CYCLE |RDMAEN ; + }switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) {case SND_SOC_DAIFMT_I2S :