UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver
  ASoC: Fix null string usage with WM8753 DAIs
  ALSA: hda - add another MacBook Pro 4, 1 subsystem ID
  ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n
  ALSA: hda - Add quirk for HP DV6700 laptop
  ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs
This commit is contained in:
Linus Torvalds 2009-01-29 18:13:22 -08:00
parent 0d28088496 de2cf591bc
commit 05986e264e
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/pci/hda/patch_conexant.c
View File

@ -347,6 +347,7 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol,
&spec->cur_mux[adc_idx]); &spec->cur_mux[adc_idx]);
} }
#ifdef CONFIG_SND_JACK
static int conexant_add_jack(struct hda_codec *codec, static int conexant_add_jack(struct hda_codec *codec,
hda_nid_t nid, int type) 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) static int conexant_init_jacks(struct hda_codec *codec)
{ {
#ifdef CONFIG_SND_JACK
struct conexant_spec *spec = codec->spec; struct conexant_spec *spec = codec->spec;
int i; int i;
@ -422,10 +422,19 @@ static int conexant_init_jacks(struct hda_codec *codec)
++hv; ++hv;
} }
} }
#endif
return 0; 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) 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, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),
SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP), SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2000Z", 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), SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD),
{} {}
}; };

1
sound/pci/hda/patch_realtek.c
View File

@ -7018,6 +7018,7 @@ static int patch_alc882(struct hda_codec *codec)
case 0x106b00a4: /* MacbookPro4,1 */ case 0x106b00a4: /* MacbookPro4,1 */
case 0x106b2c00: /* Macbook Pro rev3 */ case 0x106b2c00: /* Macbook Pro rev3 */
case 0x106b3600: /* Macbook 3.1 */ case 0x106b3600: /* Macbook 3.1 */
case 0x106b3800: /* MacbookPro4,1 - latter revision */
board_config = ALC885_MBP3; board_config = ALC885_MBP3;
break; break;
default: default:

2
sound/pci/hda/patch_sigmatel.c
View File

@ -2539,6 +2539,8 @@ static int stac92xx_build_pcms(struct hda_codec *codec)
info->name = "STAC92xx Analog"; info->name = "STAC92xx Analog";
info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback; 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] = stac92xx_pcm_analog_capture;
info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0]; info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adcs; info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adcs;

9
sound/soc/codecs/wm8753.c
View File

@ -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); EXPORT_SYMBOL_GPL(wm8753_dai);
static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode) static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode)

4
sound/soc/omap/omap-mcbsp.c
View File

@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
regs->spcr1 |= RINTM(3); regs->spcr1 |= RINTM(3);
regs->rcr2 |= RFIG; regs->rcr2 |= RFIG;
regs->xcr2 |= XFIG; 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) { switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S: case SND_SOC_DAIFMT_I2S: