aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt1
-rw-r--r--sound/pci/hda/patch_realtek.c19
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index e985cf5e041..9a56b9b273c 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -826,6 +826,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
826 toshiba Toshiba A205 826 toshiba Toshiba A205
827 acer Acer laptops 827 acer Acer laptops
828 dell Dell OEM laptops (Vostro 1200) 828 dell Dell OEM laptops (Vostro 1200)
829 zepto Zepto laptops
829 test for testing/debugging purpose, almost all controls can 830 test for testing/debugging purpose, almost all controls can
830 adjusted. Appearing only when compiled with 831 adjusted. Appearing only when compiled with
831 $CONFIG_SND_DEBUG=y 832 $CONFIG_SND_DEBUG=y
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 33282f9c01c..45e661e42c0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -107,6 +107,7 @@ enum {
107 ALC268_TOSHIBA, 107 ALC268_TOSHIBA,
108 ALC268_ACER, 108 ALC268_ACER,
109 ALC268_DELL, 109 ALC268_DELL,
110 ALC268_ZEPTO,
110#ifdef CONFIG_SND_DEBUG 111#ifdef CONFIG_SND_DEBUG
111 ALC268_TEST, 112 ALC268_TEST,
112#endif 113#endif
@@ -10105,6 +10106,7 @@ static const char *alc268_models[ALC268_MODEL_LAST] = {
10105 [ALC268_TOSHIBA] = "toshiba", 10106 [ALC268_TOSHIBA] = "toshiba",
10106 [ALC268_ACER] = "acer", 10107 [ALC268_ACER] = "acer",
10107 [ALC268_DELL] = "dell", 10108 [ALC268_DELL] = "dell",
10109 [ALC268_ZEPTO] = "zepto",
10108#ifdef CONFIG_SND_DEBUG 10110#ifdef CONFIG_SND_DEBUG
10109 [ALC268_TEST] = "test", 10111 [ALC268_TEST] = "test",
10110#endif 10112#endif
@@ -10122,6 +10124,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
10122 SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA), 10124 SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
10123 SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA), 10125 SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),
10124 SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER), 10126 SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),
10127 SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),
10125 {} 10128 {}
10126}; 10129};
10127 10130
@@ -10182,6 +10185,22 @@ static struct alc_config_preset alc268_presets[] = {
10182 .init_hook = alc268_dell_init_hook, 10185 .init_hook = alc268_dell_init_hook,
10183 .input_mux = &alc268_capture_source, 10186 .input_mux = &alc268_capture_source,
10184 }, 10187 },
10188 [ALC268_ZEPTO] = {
10189 .mixers = { alc268_base_mixer, alc268_capture_alt_mixer },
10190 .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
10191 alc268_toshiba_verbs },
10192 .num_dacs = ARRAY_SIZE(alc268_dac_nids),
10193 .dac_nids = alc268_dac_nids,
10194 .num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
10195 .adc_nids = alc268_adc_nids_alt,
10196 .hp_nid = 0x03,
10197 .dig_out_nid = ALC268_DIGOUT_NID,
10198 .num_channel_mode = ARRAY_SIZE(alc268_modes),
10199 .channel_mode = alc268_modes,
10200 .input_mux = &alc268_capture_source,
10201 .unsol_event = alc268_toshiba_unsol_event,
10202 .init_hook = alc268_toshiba_automute
10203 },
10185#ifdef CONFIG_SND_DEBUG 10204#ifdef CONFIG_SND_DEBUG
10186 [ALC268_TEST] = { 10205 [ALC268_TEST] = {
10187 .mixers = { alc268_test_mixer, alc268_capture_mixer }, 10206 .mixers = { alc268_test_mixer, alc268_capture_mixer },