diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-05-21 06:41:29 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-07-20 05:11:19 -0400 |
commit | 0dae0f83cd9956d0959f6d6de9f5391da6483274 (patch) | |
tree | c92d0a2bbe51a693d31d5c35223a4a31016b2b6f | |
parent | ea7cfcdfe6439cd98816da9d339a6bc9032d2084 (diff) |
[ALSA] hda-codec - Add support of newer version of Intel iMac
Added the pin configs for newer version of Intel iMac.
The information provided by Ivan N. Zlatev <contact@i-nz.net>.
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 32124bf00498..bef13521f6c4 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -923,6 +923,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
923 | macbook-pro-v1 Intel Mac Book Pro 1st generation | 923 | macbook-pro-v1 Intel Mac Book Pro 1st generation |
924 | macbook-pro Intel Mac Book Pro 2nd generation | 924 | macbook-pro Intel Mac Book Pro 2nd generation |
925 | imac-intel Intel iMac | 925 | imac-intel Intel iMac |
926 | imac-intel-20 Intel iMac (newer version) | ||
926 | 927 | ||
927 | STAC9202/9250/9251 | 928 | STAC9202/9250/9251 |
928 | ref Reference board, base config | 929 | ref Reference board, base config |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index e3964fc4c405..3653f57b7f69 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -64,6 +64,7 @@ enum { | |||
64 | STAC_MACBOOK_PRO_V1, | 64 | STAC_MACBOOK_PRO_V1, |
65 | STAC_MACBOOK_PRO_V2, | 65 | STAC_MACBOOK_PRO_V2, |
66 | STAC_IMAC_INTEL, | 66 | STAC_IMAC_INTEL, |
67 | STAC_IMAC_INTEL_20, | ||
67 | STAC_922X_MODELS | 68 | STAC_922X_MODELS |
68 | }; | 69 | }; |
69 | 70 | ||
@@ -567,6 +568,12 @@ static unsigned int imac_intel_pin_configs[10] = { | |||
567 | 0x400000fc, 0x400000fb, | 568 | 0x400000fc, 0x400000fb, |
568 | }; | 569 | }; |
569 | 570 | ||
571 | static unsigned int imac_intel_20_pin_configs[10] = { | ||
572 | 0x0121E21F, 0x90A7012E, 0x9017E110, 0x400000FD, | ||
573 | 0x400000FE, 0x0181E020, 0x1145E230, 0x11C5E240, | ||
574 | 0x400000FC, 0x400000FB, | ||
575 | }; | ||
576 | |||
570 | static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { | 577 | static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { |
571 | [STAC_D945_REF] = ref922x_pin_configs, | 578 | [STAC_D945_REF] = ref922x_pin_configs, |
572 | [STAC_D945GTP3] = d945gtp3_pin_configs, | 579 | [STAC_D945GTP3] = d945gtp3_pin_configs, |
@@ -576,6 +583,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { | |||
576 | [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs, | 583 | [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs, |
577 | [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs, | 584 | [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs, |
578 | [STAC_IMAC_INTEL] = imac_intel_pin_configs, | 585 | [STAC_IMAC_INTEL] = imac_intel_pin_configs, |
586 | [STAC_IMAC_INTEL_20] = imac_intel_20_pin_configs, | ||
579 | }; | 587 | }; |
580 | 588 | ||
581 | static const char *stac922x_models[STAC_922X_MODELS] = { | 589 | static const char *stac922x_models[STAC_922X_MODELS] = { |
@@ -587,6 +595,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = { | |||
587 | [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1", | 595 | [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1", |
588 | [STAC_MACBOOK_PRO_V2] = "macbook-pro", | 596 | [STAC_MACBOOK_PRO_V2] = "macbook-pro", |
589 | [STAC_IMAC_INTEL] = "imac-intel", | 597 | [STAC_IMAC_INTEL] = "imac-intel", |
598 | [STAC_IMAC_INTEL_20] = "imac-intel-20", | ||
590 | }; | 599 | }; |
591 | 600 | ||
592 | static struct snd_pci_quirk stac922x_cfg_tbl[] = { | 601 | static struct snd_pci_quirk stac922x_cfg_tbl[] = { |
@@ -2037,6 +2046,9 @@ static int patch_stac922x(struct hda_codec *codec) | |||
2037 | case 0x106b0700: /* Intel-based iMac */ | 2046 | case 0x106b0700: /* Intel-based iMac */ |
2038 | spec->board_config = STAC_IMAC_INTEL; | 2047 | spec->board_config = STAC_IMAC_INTEL; |
2039 | break; | 2048 | break; |
2049 | case 0x106b1700: /* Intel iMac 20 */ | ||
2050 | spec->board_config = STAC_IMAC_INTEL_20; | ||
2051 | break; | ||
2040 | } | 2052 | } |
2041 | } | 2053 | } |
2042 | 2054 | ||