From 4f04ac442f7d1e4c3bf98815973c66ae84709d1d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 21 May 2007 12:41:29 +0200 Subject: [PATCH] --- yaml --- r: 62043 b: refs/heads/master c: 0dae0f83cd9956d0959f6d6de9f5391da6483274 h: refs/heads/master i: 62041: c957748ae56853b55a006cf7f702854fe942866e 62039: 14c210a8f7f535e2f79bfb159aecf41b655006dc v: v3 --- [refs] | 2 +- .../Documentation/sound/alsa/ALSA-Configuration.txt | 1 + trunk/sound/pci/hda/patch_sigmatel.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 752cbe368a69..62f0d6bdebdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea7cfcdfe6439cd98816da9d339a6bc9032d2084 +refs/heads/master: 0dae0f83cd9956d0959f6d6de9f5391da6483274 diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 32124bf00498..bef13521f6c4 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -923,6 +923,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. macbook-pro-v1 Intel Mac Book Pro 1st generation macbook-pro Intel Mac Book Pro 2nd generation imac-intel Intel iMac + imac-intel-20 Intel iMac (newer version) STAC9202/9250/9251 ref Reference board, base config diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index e3964fc4c405..3653f57b7f69 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -64,6 +64,7 @@ enum { STAC_MACBOOK_PRO_V1, STAC_MACBOOK_PRO_V2, STAC_IMAC_INTEL, + STAC_IMAC_INTEL_20, STAC_922X_MODELS }; @@ -567,6 +568,12 @@ static unsigned int imac_intel_pin_configs[10] = { 0x400000fc, 0x400000fb, }; +static unsigned int imac_intel_20_pin_configs[10] = { + 0x0121E21F, 0x90A7012E, 0x9017E110, 0x400000FD, + 0x400000FE, 0x0181E020, 0x1145E230, 0x11C5E240, + 0x400000FC, 0x400000FB, +}; + static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { [STAC_D945_REF] = ref922x_pin_configs, [STAC_D945GTP3] = d945gtp3_pin_configs, @@ -576,6 +583,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = { [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs, [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs, [STAC_IMAC_INTEL] = imac_intel_pin_configs, + [STAC_IMAC_INTEL_20] = imac_intel_20_pin_configs, }; static const char *stac922x_models[STAC_922X_MODELS] = { @@ -587,6 +595,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = { [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1", [STAC_MACBOOK_PRO_V2] = "macbook-pro", [STAC_IMAC_INTEL] = "imac-intel", + [STAC_IMAC_INTEL_20] = "imac-intel-20", }; static struct snd_pci_quirk stac922x_cfg_tbl[] = { @@ -2037,6 +2046,9 @@ static int patch_stac922x(struct hda_codec *codec) case 0x106b0700: /* Intel-based iMac */ spec->board_config = STAC_IMAC_INTEL; break; + case 0x106b1700: /* Intel iMac 20 */ + spec->board_config = STAC_IMAC_INTEL_20; + break; } }