diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-06-19 06:17:42 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-07-20 05:11:30 -0400 |
commit | 76c08828709129bdce6c6a325e0342ba73f2618f (patch) | |
tree | c2c9f08a3ee14c7b8191aef627242ee57e077498 | |
parent | b69f3748400517d1023337b97456a0a1cdc74a79 (diff) |
[ALSA] hda-codec - Add model dell for Dell XPS M1210
Added a new model 'dell' for Dell XPS M1210 with STAC922x codec chip.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 7659e5071c41..a5a1ed20b3c0 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -927,6 +927,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
927 | ref Reference board | 927 | ref Reference board |
928 | 3stack D945 3stack | 928 | 3stack D945 3stack |
929 | 5stack D945 5stack + SPDIF | 929 | 5stack D945 5stack + SPDIF |
930 | dell Dell XPS M1210 | ||
930 | intel-mac-v1 Intel Mac Type 1 | 931 | intel-mac-v1 Intel Mac Type 1 |
931 | intel-mac-v2 Intel Mac Type 2 | 932 | intel-mac-v2 Intel Mac Type 2 |
932 | intel-mac-v3 Intel Mac Type 3 | 933 | intel-mac-v3 Intel Mac Type 3 |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index addcb2a0ae66..36423ca693e7 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -59,6 +59,7 @@ enum { | |||
59 | STAC_D945_REF, | 59 | STAC_D945_REF, |
60 | STAC_D945GTP3, | 60 | STAC_D945GTP3, |
61 | STAC_D945GTP5, | 61 | STAC_D945GTP5, |
62 | STAC_922X_DELL, | ||
62 | STAC_INTEL_MAC_V1, | 63 | STAC_INTEL_MAC_V1, |
63 | STAC_INTEL_MAC_V2, | 64 | STAC_INTEL_MAC_V2, |
64 | STAC_INTEL_MAC_V3, | 65 | STAC_INTEL_MAC_V3, |
@@ -586,10 +587,17 @@ static unsigned int intel_mac_v5_pin_configs[10] = { | |||
586 | 0x400000fc, 0x400000fb, | 587 | 0x400000fc, 0x400000fb, |
587 | }; | 588 | }; |
588 | 589 | ||
590 | static unsigned int stac922x_dell_pin_configs[10] = { | ||
591 | 0x0221121e, 0x408103ff, 0x02a1123e, 0x90100310, | ||
592 | 0x408003f1, 0x0221122f, 0x03451340, 0x40c003f2, | ||
593 | 0x50a003f3, 0x405003f4 | ||
594 | }; | ||
595 | |||
589 | static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { | 596 | static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { |
590 | [STAC_D945_REF] = ref922x_pin_configs, | 597 | [STAC_D945_REF] = ref922x_pin_configs, |
591 | [STAC_D945GTP3] = d945gtp3_pin_configs, | 598 | [STAC_D945GTP3] = d945gtp3_pin_configs, |
592 | [STAC_D945GTP5] = d945gtp5_pin_configs, | 599 | [STAC_D945GTP5] = d945gtp5_pin_configs, |
600 | [STAC_922X_DELL] = stac922x_dell_pin_configs, | ||
593 | [STAC_INTEL_MAC_V1] = intel_mac_v1_pin_configs, | 601 | [STAC_INTEL_MAC_V1] = intel_mac_v1_pin_configs, |
594 | [STAC_INTEL_MAC_V2] = intel_mac_v2_pin_configs, | 602 | [STAC_INTEL_MAC_V2] = intel_mac_v2_pin_configs, |
595 | [STAC_INTEL_MAC_V3] = intel_mac_v3_pin_configs, | 603 | [STAC_INTEL_MAC_V3] = intel_mac_v3_pin_configs, |
@@ -608,6 +616,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = { | |||
608 | [STAC_D945_REF] = "ref", | 616 | [STAC_D945_REF] = "ref", |
609 | [STAC_D945GTP5] = "5stack", | 617 | [STAC_D945GTP5] = "5stack", |
610 | [STAC_D945GTP3] = "3stack", | 618 | [STAC_D945GTP3] = "3stack", |
619 | [STAC_922X_DELL] = "dell", | ||
611 | [STAC_INTEL_MAC_V1] = "intel-mac-v1", | 620 | [STAC_INTEL_MAC_V1] = "intel-mac-v1", |
612 | [STAC_INTEL_MAC_V2] = "intel-mac-v2", | 621 | [STAC_INTEL_MAC_V2] = "intel-mac-v2", |
613 | [STAC_INTEL_MAC_V3] = "intel-mac-v3", | 622 | [STAC_INTEL_MAC_V3] = "intel-mac-v3", |
@@ -683,6 +692,9 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = { | |||
683 | /* Apple Mac Mini (early 2006) */ | 692 | /* Apple Mac Mini (early 2006) */ |
684 | SND_PCI_QUIRK(0x8384, 0x7680, | 693 | SND_PCI_QUIRK(0x8384, 0x7680, |
685 | "Mac Mini", STAC_INTEL_MAC_V3), | 694 | "Mac Mini", STAC_INTEL_MAC_V3), |
695 | /* Dell */ | ||
696 | SND_PCI_QUIRK(0x1028, 0x01d7, "Dell XPS M1210", STAC_922X_DELL), | ||
697 | |||
686 | {} /* terminator */ | 698 | {} /* terminator */ |
687 | }; | 699 | }; |
688 | 700 | ||