Commit b637dc0d authored by Linus Torvalds's avatar Linus Torvalds

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:
  ALSA: hda - Don't override ADC definitions for ALC codecs
  ALSA: hda - Add missing vmaster initialization for ALC269
  ASoC: Add missing DRV_NAME definitions for fsl/* drivers
parents 42c5c843 8884be98
...@@ -13563,6 +13563,8 @@ static int patch_alc269(struct hda_codec *codec) ...@@ -13563,6 +13563,8 @@ static int patch_alc269(struct hda_codec *codec)
set_capture_mixer(spec); set_capture_mixer(spec);
set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
spec->vmaster_nid = 0x02;
codec->patch_ops = alc_patch_ops; codec->patch_ops = alc_patch_ops;
if (board_config == ALC269_AUTO) if (board_config == ALC269_AUTO)
spec->init_hook = alc269_auto_init; spec->init_hook = alc269_auto_init;
...@@ -15577,9 +15579,12 @@ static int patch_alc861vd(struct hda_codec *codec) ...@@ -15577,9 +15579,12 @@ static int patch_alc861vd(struct hda_codec *codec)
spec->stream_digital_playback = &alc861vd_pcm_digital_playback; spec->stream_digital_playback = &alc861vd_pcm_digital_playback;
spec->stream_digital_capture = &alc861vd_pcm_digital_capture; spec->stream_digital_capture = &alc861vd_pcm_digital_capture;
spec->adc_nids = alc861vd_adc_nids; if (!spec->adc_nids) {
spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); spec->adc_nids = alc861vd_adc_nids;
spec->capsrc_nids = alc861vd_capsrc_nids; spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);
}
if (!spec->capsrc_nids)
spec->capsrc_nids = alc861vd_capsrc_nids;
set_capture_mixer(spec); set_capture_mixer(spec);
set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
...@@ -17496,9 +17501,12 @@ static int patch_alc662(struct hda_codec *codec) ...@@ -17496,9 +17501,12 @@ static int patch_alc662(struct hda_codec *codec)
spec->stream_digital_playback = &alc662_pcm_digital_playback; spec->stream_digital_playback = &alc662_pcm_digital_playback;
spec->stream_digital_capture = &alc662_pcm_digital_capture; spec->stream_digital_capture = &alc662_pcm_digital_capture;
spec->adc_nids = alc662_adc_nids; if (!spec->adc_nids) {
spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); spec->adc_nids = alc662_adc_nids;
spec->capsrc_nids = alc662_capsrc_nids; spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);
}
if (!spec->capsrc_nids)
spec->capsrc_nids = alc662_capsrc_nids;
if (!spec->cap_mixer) if (!spec->cap_mixer)
set_capture_mixer(spec); set_capture_mixer(spec);
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include "mpc5200_psc_ac97.h" #include "mpc5200_psc_ac97.h"
#include "../codecs/stac9766.h" #include "../codecs/stac9766.h"
#define DRV_NAME "efika-audio-fabric"
static struct snd_soc_device device; static struct snd_soc_device device;
static struct snd_soc_card card; static struct snd_soc_card card;
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include "mpc5200_psc_ac97.h" #include "mpc5200_psc_ac97.h"
#include "../codecs/wm9712.h" #include "../codecs/wm9712.h"
#define DRV_NAME "pcm030-audio-fabric"
static struct snd_soc_device device; static struct snd_soc_device device;
static struct snd_soc_card card; static struct snd_soc_card card;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment