From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 16 Aug 2011 12:25:22 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=497979262f9e812be1d64e597ec1bbbf92c8eba3;p=mv-sheeva.git

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/alc268_quirks.c
---

497979262f9e812be1d64e597ec1bbbf92c8eba3
diff --cc sound/pci/hda/alc268_quirks.c
index 20d7364f723,2e5876ce71f..7cbbde41164
--- a/sound/pci/hda/alc268_quirks.c
+++ b/sound/pci/hda/alc268_quirks.c
@@@ -395,10 -465,19 +395,10 @@@ static const struct snd_pci_quirk alc26
  	{}
  };
  
 -/* Toshiba laptops have no unique PCI SSID but only codec SSID */
 -static const struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {
 -	SND_PCI_QUIRK(0x1179, 0xff0a, "TOSHIBA X-200", ALC268_AUTO),
 -	SND_PCI_QUIRK(0x1179, 0xff0e, "TOSHIBA X-200 HDMI", ALC268_AUTO),
 -	SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05",
 -			   ALC268_TOSHIBA),
 -	{}
 -};
 -
  static const struct alc_config_preset alc268_presets[] = {
  	[ALC267_QUANTA_IL1] = {
- 		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer,
- 			    alc268_capture_nosrc_mixer },
+ 		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },
+ 		.cap_mixer = alc268_capture_nosrc_mixer,
  		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
  				alc267_quanta_il1_verbs },
  		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@@ -427,9 -506,27 +427,9 @@@
  		.channel_mode = alc268_modes,
  		.input_mux = &alc268_capture_source,
  	},
 -	[ALC268_TOSHIBA] = {
 -		.mixers = { alc268_toshiba_mixer, alc268_beep_mixer },
 -		.cap_mixer = alc268_capture_alt_mixer,
 -		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
 -				alc268_toshiba_verbs },
 -		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
 -		.dac_nids = alc268_dac_nids,
 -		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
 -		.adc_nids = alc268_adc_nids_alt,
 -		.capsrc_nids = alc268_capsrc_nids,
 -		.hp_nid = 0x03,
 -		.num_channel_mode = ARRAY_SIZE(alc268_modes),
 -		.channel_mode = alc268_modes,
 -		.input_mux = &alc268_capture_source,
 -		.unsol_event = alc_sku_unsol_event,
 -		.setup = alc268_toshiba_setup,
 -		.init_hook = alc_inithook,
 -	},
  	[ALC268_ACER] = {
- 		.mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,
- 			    alc268_beep_mixer },
+ 		.mixers = { alc268_acer_mixer, alc268_beep_mixer },
+ 		.cap_mixer = alc268_capture_alt_mixer,
  		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
  				alc268_acer_verbs },
  		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@@ -481,9 -577,46 +480,10 @@@
  		.setup = alc268_acer_lc_setup,
  		.init_hook = alc_inithook,
  	},
 -	[ALC268_DELL] = {
 -		.mixers = { alc268_dell_mixer, alc268_beep_mixer},
 -		.cap_mixer = alc268_capture_nosrc_mixer,
 -		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
 -				alc268_dell_verbs },
 -		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
 -		.dac_nids = alc268_dac_nids,
 -		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
 -		.adc_nids = alc268_adc_nids_alt,
 -		.capsrc_nids = alc268_capsrc_nids,
 -		.hp_nid = 0x02,
 -		.num_channel_mode = ARRAY_SIZE(alc268_modes),
 -		.channel_mode = alc268_modes,
 -		.unsol_event = alc_sku_unsol_event,
 -		.setup = alc268_dell_setup,
 -		.init_hook = alc_inithook,
 -	},
 -	[ALC268_ZEPTO] = {
 -		.mixers = { alc268_base_mixer, alc268_beep_mixer },
 -		.cap_mixer = alc268_capture_alt_mixer,
 -		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
 -				alc268_toshiba_verbs },
 -		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
 -		.dac_nids = alc268_dac_nids,
 -		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
 -		.adc_nids = alc268_adc_nids_alt,
 -		.capsrc_nids = alc268_capsrc_nids,
 -		.hp_nid = 0x03,
 -		.dig_out_nid = ALC268_DIGOUT_NID,
 -		.num_channel_mode = ARRAY_SIZE(alc268_modes),
 -		.channel_mode = alc268_modes,
 -		.input_mux = &alc268_capture_source,
 -		.unsol_event = alc_sku_unsol_event,
 -		.setup = alc268_toshiba_setup,
 -		.init_hook = alc_inithook,
 -	},
  #ifdef CONFIG_SND_DEBUG
  	[ALC268_TEST] = {
- 		.mixers = { alc268_test_mixer, alc268_capture_mixer },
+ 		.mixers = { alc268_test_mixer },
+ 		.cap_mixer = alc268_capture_mixer,
  		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
  				alc268_volume_init_verbs,
  				alc268_beep_init_verbs },