* [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 @ 2010-06-06 23:09 Justin P. Mattock 2010-06-06 23:09 ` [PATCH 2/5]alsa:patch_realtek.c Add support for the MacBookAir1,1 Justin P. Mattock 2010-06-08 15:01 ` [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Takashi Iwai 0 siblings, 2 replies; 8+ messages in thread From: Justin P. Mattock @ 2010-06-06 23:09 UTC (permalink / raw) To: alsa-devel; +Cc: tiwai, linux-kernel, Justin P. Mattock This adds the SSID number to snd_pci_quirk for the MacBookAir2,1 taken from codec#0 at: http://launchpadlibrarian.net/49455483/Card0.Codecs.codec.0.txt keep in mind I do not have one of these machines on hand so please if you do have this machine please test for me.. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 17d4548..9b82d28 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9487,6 +9487,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3), + SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC885_MBA21), {} /* terminator */ }; -- 1.6.5.2.180.gc5b3e ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/5]alsa:patch_realtek.c Add support for the MacBookAir1,1 2010-06-06 23:09 [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Justin P. Mattock @ 2010-06-06 23:09 ` Justin P. Mattock 2010-06-06 23:09 ` [PATCH 3/5]alsa:patch_realtek.c Add SSID table for MacBookAir1,1 Justin P. Mattock 2010-06-08 15:01 ` [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Takashi Iwai 1 sibling, 1 reply; 8+ messages in thread From: Justin P. Mattock @ 2010-06-06 23:09 UTC (permalink / raw) To: alsa-devel; +Cc: tiwai, linux-kernel, Justin P. Mattock Note: The below patch does not work with patch 3/5 (Add-SSID-table-for-MacBookAir1-1) I'm giving the option of either adding/creating a whole new section for the MacBookAir1,1 and or just add the SSID for the MacBookAir1,1 using ALC885_MBP3 (Add-SSID-table-for-MacBookAir1-1). Below is a patch that add's support to the MacBookAir1,1 to patch_realtek.c to enable it's functions for sound mic, etc.. the bug entry is located here: https://bugs.launchpad.net/mactel-support/+bug/268301 Also cleans up some coding fixes for:ALC885_MBA21 Note:I do not have this machine on hand only codec#0 file for the machine so please test if you have the appropriate equipment. And also keep in mind I did look at both the MacBookAir1,1(2,1) both seem to display no info on what/where the mic is in their codec#0 file..(hopefully that can get resolved). Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> --- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + sound/pci/hda/patch_realtek.c | 78 ++++++++++++++++++++++---- 2 files changed, 68 insertions(+), 11 deletions(-) diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 1d38b0d..d3838b5 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -125,6 +125,7 @@ ALC882/883/885/888/889 macpro MacPro support mb5 Macbook 5,1 macmini3 Macmini 3,1 + mba11 MacBook Air 1,1 mba21 Macbook Air 2,1 mbp3 Macbook Pro rev3 imac24 iMac 24'' with jack detection diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 9b82d28..5cc55ff 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -209,6 +209,7 @@ enum { ALC882_ASUS_A7J, ALC882_ASUS_A7M, ALC885_MACPRO, + ALC885_MBA11, ALC885_MBA21, ALC885_MBP3, ALC885_MB5, @@ -7444,6 +7445,13 @@ static struct snd_kcontrol_new alc885_mba21_mixer[] = { { } }; +/* MacBookAir1,1 not sure what/where things are(dont have the machine). */ + +static struct snd_kcontrol_new alc885_mba11_mixer[] = { + HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT), + HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 0x02, HDA_OUTPUT), + { } +}; static struct snd_kcontrol_new alc885_mbp3_mixer[] = { HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT), @@ -7929,6 +7937,40 @@ static struct hda_verb alc885_mba21_init_verbs[] = { { } }; +static struct hda_verb alc885_mba11_init_verbs[] = { + /*Internal and HP Speaker Mixer*/ + {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, + {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, + /* Main Speaker */ + {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, (PIN_OUT | AC_PINCTL_VREF_50) }, + {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, + {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, + /* HP jack */ + {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4}, + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, + {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, + {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, (ALC880_HP_EVENT | AC_USRSP_EN)}, + /* FIXME: Line in? (as well as the mic). */ + {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_VREF_50}, + {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, + /* 0x22 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In */ + {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, + {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, + {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, + /* 0x23 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In */ + {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, + {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, + {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, + /* 0x24 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In */ + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, + { } +}; /* Macbook Pro rev3 */ static struct hda_verb alc885_mbp3_init_verbs[] = { @@ -9298,6 +9340,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = { [ALC885_MACPRO] = "macpro", [ALC885_MB5] = "mb5", [ALC885_MACMINI3] = "macmini3", + [ALC885_MBA11] = "mba11", [ALC885_MBA21] = "mba21", [ALC885_MBP3] = "mbp3", [ALC885_IMAC24] = "imac24", @@ -9488,6 +9531,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3), SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC885_MBA21), + SND_PCI_QUIRK(0x106b, 0x3400, "MacBookAir 1,1", ALC885_MBA11), {} /* terminator */ }; @@ -9539,17 +9583,29 @@ static struct alc_config_preset alc882_presets[] = { .input_mux = &alc882_capture_source, .dig_out_nid = ALC882_DIGOUT_NID, }, - [ALC885_MBA21] = { - .mixers = { alc885_mba21_mixer }, - .init_verbs = { alc885_mba21_init_verbs, alc880_gpio1_init_verbs }, - .num_dacs = 2, - .dac_nids = alc882_dac_nids, - .channel_mode = alc885_mba21_ch_modes, - .num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes), - .input_mux = &alc882_capture_source, - .unsol_event = alc_automute_amp_unsol_event, - .setup = alc885_mba21_setup, - .init_hook = alc_automute_amp, + [ALC885_MBA11] = { + .mixers = { alc885_mba11_mixer }, + .init_verbs = { alc885_mba11_init_verbs, alc880_gpio1_init_verbs }, + .num_dacs = 2, + .dac_nids = alc882_dac_nids, + .channel_mode = alc885_mba21_ch_modes, + .num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes), + .input_mux = &alc882_capture_source, + .unsol_event = alc_automute_amp_unsol_event, + .setup = alc885_mb3_setup, + .init_hook = alc_automute_amp, + }, + [ALC885_MBA21] = { + .mixers = { alc885_mba21_mixer }, + .init_verbs = { alc885_mba21_init_verbs, alc880_gpio1_init_verbs }, + .num_dacs = 2, + .dac_nids = alc882_dac_nids, + .channel_mode = alc885_mba21_ch_modes, + .num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes), + .input_mux = &alc882_capture_source, + .unsol_event = alc_automute_amp_unsol_event, + .setup = alc885_mba21_setup, + .init_hook = alc_automute_amp, }, [ALC885_MBP3] = { .mixers = { alc885_mbp3_mixer, alc882_chmode_mixer }, -- 1.6.5.2.180.gc5b3e ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/5]alsa:patch_realtek.c Add SSID table for MacBookAir1,1 2010-06-06 23:09 ` [PATCH 2/5]alsa:patch_realtek.c Add support for the MacBookAir1,1 Justin P. Mattock @ 2010-06-06 23:09 ` Justin P. Mattock 2010-06-06 23:09 ` [PATCH 4/5]alsa:patch_realtek.c Add support for the iMac7,1 Justin P. Mattock 0 siblings, 1 reply; 8+ messages in thread From: Justin P. Mattock @ 2010-06-06 23:09 UTC (permalink / raw) To: alsa-devel; +Cc: tiwai, linux-kernel, Justin P. Mattock Note: This patch does not work with Patch 2/5 (Add-support-for-the-MacBookAir1-1). This patch add's the MacBookAir1,1 SSID entry to patch_realtek.c which adds sound support. bug entry: https://bugs.launchpad.net/mactel-support/+bug/268301 Note:I do not have this machine on hand only codec#0 file for the machine so please test if you have the appropriate equipment. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> --- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + sound/pci/hda/patch_realtek.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 1d38b0d..d3838b5 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -125,6 +125,7 @@ ALC882/883/885/888/889 macpro MacPro support mb5 Macbook 5,1 macmini3 Macmini 3,1 + mba11 MacBook Air 1,1 mba21 Macbook Air 2,1 mbp3 Macbook Pro rev3 imac24 iMac 24'' with jack detection diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 17d4548..149b375 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9487,6 +9487,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3), + SND_PCI_QUIRK(0x106b, 0x3400, "MacBookAir 1,1", ALC885_MBP3), {} /* terminator */ }; -- 1.6.5.2.180.gc5b3e ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/5]alsa:patch_realtek.c Add support for the iMac7,1 2010-06-06 23:09 ` [PATCH 3/5]alsa:patch_realtek.c Add SSID table for MacBookAir1,1 Justin P. Mattock @ 2010-06-06 23:09 ` Justin P. Mattock 2010-06-06 23:09 ` [PATCH 5/5]alsa:patch_realtek.c Add SSID table for iMac7,1 Justin P. Mattock 0 siblings, 1 reply; 8+ messages in thread From: Justin P. Mattock @ 2010-06-06 23:09 UTC (permalink / raw) To: alsa-devel; +Cc: tiwai, linux-kernel, Justin P. Mattock Note: The below patch does not work with patch 5/5 (Add-SSID-table-for-iMac7-1) I'm giving the option of either adding/creating a whole new section for the iMac7,1 and or just add the SSID for the iMac7,1 using ALC882_ASUS_A7M stated on bug entry: https://bugs.launchpad.net/mactel-support/+bug/360866 Note:I do not have this machine on hand only codec#0 file for the machine so please test if you have the appropriate equipment. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> --- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + sound/pci/hda/patch_realtek.c | 62 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 0 deletions(-) diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 1d38b0d..a9aac53 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -127,6 +127,7 @@ ALC882/883/885/888/889 macmini3 Macmini 3,1 mba21 Macbook Air 2,1 mbp3 Macbook Pro rev3 + imac71 iMac 7,1 imac24 iMac 24'' with jack detection imac91 iMac 9,1 w2jc ASUS W2JC diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 17d4548..5ef35b8 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -213,6 +213,7 @@ enum { ALC885_MBP3, ALC885_MB5, ALC885_MACMINI3, + ALC885_IMAC71, ALC885_IMAC24, ALC885_IMAC91, ALC883_3ST_2ch_DIG, @@ -7493,6 +7494,21 @@ static struct snd_kcontrol_new alc885_macmini3_mixer[] = { { } /* end */ }; +static struct snd_kcontrol_new alc882_imac71_mixer[] = { + HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), + HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), + HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), + HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), + HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), + HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), + HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), + { } /* end */ +}; + + static struct snd_kcontrol_new alc885_imac91_mixer[] = { HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT), HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 0x02, HDA_INPUT), @@ -7994,6 +8010,25 @@ static struct hda_verb alc885_mbp3_init_verbs[] = { { } }; +/* iMac7,1 */ +static struct hda_verb alc882_imac71_init_verbs[] = { + {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, + + {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, + {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, + {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, + + {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */ + {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */ + {0x16, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */ + + {0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */ + {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */ + {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */ + { } /* end */ +}; + /* iMac 9,1 */ static struct hda_verb alc885_imac91_init_verbs[] = { /* Internal Speaker Pin (0x0c) */ @@ -8099,7 +8134,14 @@ static void alc885_mba21_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[0] = 0x18; } +static void alc885_imac71_setup(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + spec->autocfg.hp_pins[0] = 0x15; + spec->autocfg.speaker_pins[0] = 0x14; + spec->autocfg.speaker_pins[1] = 0x16; +} static void alc885_mbp3_setup(struct hda_codec *codec) { @@ -9300,6 +9342,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = { [ALC885_MACMINI3] = "macmini3", [ALC885_MBA21] = "mba21", [ALC885_MBP3] = "mbp3", + [ALC882_IMAC71] = "imac71", [ALC885_IMAC24] = "imac24", [ALC885_IMAC91] = "imac91", [ALC883_3ST_2ch_DIG] = "3stack-2ch-dig", @@ -9478,6 +9521,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3), SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31), SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3), + SND_PCI_QUIRK(0x106b, 0x3200, "iMac 7,1 Aluminum", ALC882_IMAC71), SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24), SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC885_IMAC91), SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5), @@ -9608,6 +9652,24 @@ static struct alc_config_preset alc882_presets[] = { .input_mux = &alc882_capture_source, .init_hook = alc885_macpro_init_hook, }, + [ALC882_IMAC71] = { + .mixers = { alc882_imac71_mixer, alc882_chmode_mixer }, + .init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs, + alc882_imac71_init_verbs}, + .num_dacs = ARRAY_SIZE(alc882_dac_nids), + .dac_nids = alc882_dac_nids, + .dig_out_nid = ALC882_DIGOUT_NID, + .num_adc_nids = ARRAY_SIZE(alc882_adc_nids), + .adc_nids = alc882_adc_nids, + .capsrc_nids = alc882_capsrc_nids, + .num_channel_mode = ARRAY_SIZE(alc882_3ST_6ch_modes), + .channel_mode = alc882_3ST_6ch_modes, + .need_dac_fix = 1, + .input_mux = &alc882_capture_source, + .unsol_event = alc_automute_amp_unsol_event, + .setup = alc885_imac71_setup, + .init_hook = alc_automute_amp, + } [ALC885_IMAC24] = { .mixers = { alc885_imac24_mixer }, .init_verbs = { alc885_imac24_init_verbs }, -- 1.6.5.2.180.gc5b3e ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/5]alsa:patch_realtek.c Add SSID table for iMac7,1. 2010-06-06 23:09 ` [PATCH 4/5]alsa:patch_realtek.c Add support for the iMac7,1 Justin P. Mattock @ 2010-06-06 23:09 ` Justin P. Mattock 0 siblings, 0 replies; 8+ messages in thread From: Justin P. Mattock @ 2010-06-06 23:09 UTC (permalink / raw) To: alsa-devel; +Cc: tiwai, linux-kernel, Justin P. Mattock Note: This patch does not work with Patch 4/5 (Add-support-for-the-iMac7-1). This patch add's the iMac7,1 SSID entry to patch_realtek.c which adds sound support. bug entry: https://bugs.launchpad.net/mactel-support/+bug/360866 Note:I do not have this machine on hand only codec#0 file for the machine so please test if you have the appropriate equipment. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> --- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + sound/pci/hda/patch_realtek.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 1d38b0d..a9aac53 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -127,6 +127,7 @@ ALC882/883/885/888/889 macmini3 Macmini 3,1 mba21 Macbook Air 2,1 mbp3 Macbook Pro rev3 + imac71 iMac 7,1 imac24 iMac 24'' with jack detection imac91 iMac 9,1 w2jc ASUS W2JC diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 17d4548..a4f71fb 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9478,6 +9478,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3), SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31), SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3), + SND_PCI_QUIRK(0x106b, 0x3200, "iMac 7,1 Aluminum", ALC882_ASUS_A7M), SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24), SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC885_IMAC91), SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5), -- 1.6.5.2.180.gc5b3e ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 2010-06-06 23:09 [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Justin P. Mattock 2010-06-06 23:09 ` [PATCH 2/5]alsa:patch_realtek.c Add support for the MacBookAir1,1 Justin P. Mattock @ 2010-06-08 15:01 ` Takashi Iwai 2010-06-08 16:11 ` Justin P. Mattock 2010-06-08 17:50 ` Justin P. Mattock 1 sibling, 2 replies; 8+ messages in thread From: Takashi Iwai @ 2010-06-08 15:01 UTC (permalink / raw) To: Justin P. Mattock; +Cc: alsa-devel, linux-kernel At Sun, 6 Jun 2010 16:09:49 -0700, Justin P. Mattock wrote: > > This adds the SSID number to snd_pci_quirk for the > MacBookAir2,1 taken from codec#0 at: > http://launchpadlibrarian.net/49455483/Card0.Codecs.codec.0.txt > keep in mind I do not have one of these machines on hand > so please if you do have this machine please test for me.. > > Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> I applied this one (after rearranging the quirk list order). Also the patch 3 and 5, both one-liner additions of a quirk, are applied, too, since they got tested somehow in bug reports. Could you rebase your changes for the proper MBA 1,1 and imac 7,1 against the latest sound tree so that anyone can test them? If they work better, then we can apply later your changes in addition. Thanks! Takashi > --- > sound/pci/hda/patch_realtek.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index 17d4548..9b82d28 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -9487,6 +9487,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { > SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5), > SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), > SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3), > + SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC885_MBA21), > {} /* terminator */ > }; > > -- > 1.6.5.2.180.gc5b3e > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 2010-06-08 15:01 ` [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Takashi Iwai @ 2010-06-08 16:11 ` Justin P. Mattock 2010-06-08 17:50 ` Justin P. Mattock 1 sibling, 0 replies; 8+ messages in thread From: Justin P. Mattock @ 2010-06-08 16:11 UTC (permalink / raw) To: Takashi Iwai; +Cc: alsa-devel, linux-kernel On 06/08/2010 08:01 AM, Takashi Iwai wrote: > At Sun, 6 Jun 2010 16:09:49 -0700, > Justin P. Mattock wrote: >> >> This adds the SSID number to snd_pci_quirk for the >> MacBookAir2,1 taken from codec#0 at: >> http://launchpadlibrarian.net/49455483/Card0.Codecs.codec.0.txt >> keep in mind I do not have one of these machines on hand >> so please if you do have this machine please test for me.. >> >> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com> > > I applied this one (after rearranging the quirk list order). > > Also the patch 3 and 5, both one-liner additions of a quirk, are > applied, too, since they got tested somehow in bug reports. > > Could you rebase your changes for the proper MBA 1,1 and imac 7,1 > against the latest sound tree so that anyone can test them? If they > work better, then we can apply later your changes in addition. > > > Thanks! > > Takashi > o.k. cool.. I'll rebase those two patches and send them out (hopefully people test).. >> --- >> sound/pci/hda/patch_realtek.c | 1 + >> 1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c >> index 17d4548..9b82d28 100644 >> --- a/sound/pci/hda/patch_realtek.c >> +++ b/sound/pci/hda/patch_realtek.c >> @@ -9487,6 +9487,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { >> SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5), >> SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), >> SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3), >> + SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC885_MBA21), >> {} /* terminator */ >> }; >> >> -- >> 1.6.5.2.180.gc5b3e >> > cheers, Justin P. Mattock ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 2010-06-08 15:01 ` [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Takashi Iwai 2010-06-08 16:11 ` Justin P. Mattock @ 2010-06-08 17:50 ` Justin P. Mattock 1 sibling, 0 replies; 8+ messages in thread From: Justin P. Mattock @ 2010-06-08 17:50 UTC (permalink / raw) To: Takashi Iwai; +Cc: alsa-devel, linux-kernel On 06/08/2010 08:01 AM, Takashi Iwai wrote: > At Sun, 6 Jun 2010 16:09:49 -0700, > Justin P. Mattock wrote: >> >> This adds the SSID number to snd_pci_quirk for the >> MacBookAir2,1 taken from codec#0 at: >> http://launchpadlibrarian.net/49455483/Card0.Codecs.codec.0.txt >> keep in mind I do not have one of these machines on hand >> so please if you do have this machine please test for me.. >> >> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com> > > I applied this one (after rearranging the quirk list order). > > Also the patch 3 and 5, both one-liner additions of a quirk, are > applied, too, since they got tested somehow in bug reports. > > Could you rebase your changes for the proper MBA 1,1 and imac 7,1 > against the latest sound tree so that anyone can test them? If they > work better, then we can apply later your changes in addition. > > > Thanks! > > Takashi o.k. rebased these two against the latest sound tree..noticed a couple of messups which are fixed now (Note to myself: when tired don't code).. hopefully people test these and see.. cheers, Justin P. Mattock ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-06-08 17:50 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-06-06 23:09 [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Justin P. Mattock 2010-06-06 23:09 ` [PATCH 2/5]alsa:patch_realtek.c Add support for the MacBookAir1,1 Justin P. Mattock 2010-06-06 23:09 ` [PATCH 3/5]alsa:patch_realtek.c Add SSID table for MacBookAir1,1 Justin P. Mattock 2010-06-06 23:09 ` [PATCH 4/5]alsa:patch_realtek.c Add support for the iMac7,1 Justin P. Mattock 2010-06-06 23:09 ` [PATCH 5/5]alsa:patch_realtek.c Add SSID table for iMac7,1 Justin P. Mattock 2010-06-08 15:01 ` [PATCH 1/5]alsa:patch_realtek.c Add SSID table for MacBookAir2,1 Takashi Iwai 2010-06-08 16:11 ` Justin P. Mattock 2010-06-08 17:50 ` Justin P. Mattock
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox