Commit 4b7e1803 authored by Justin P. Mattock's avatar Justin P. Mattock Committed by Takashi Iwai
Browse files

ALSA: hda - iMac 9,1 sound patch. 

This is an updated patch for the Apple iMac 9,1 model to add sound.
Original patch posted here:
http://article.gmane.org/gmane.linux.alsa.devel/61361/match=



I have been using this patch for a while now
and have to say it works vary well, except for a few minor 
things:

	With the iMac 24-inch 3.06GHz Intel Core 2 Duo
	everything seems to be working as it should,
        although I have not looked into the microphone
	(never really use one, nor have any apps to test,
	my guess is it doesn't work, or I never figured out how
	to get it to work).

	With the iMac 24-inch 2.66GHz Intel Core 2 Duo
	everything is the same as with the above machine 
	except I'm hearing a light scratchy/distortion noise
	come out of the speakers when using headphones(above machine
	does not do this).

Other than that the sound level is great(especially with good Dj headphones).

Signed-off-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Tested-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ac2c92e0

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ ALC882/883/885/888/889 
  mb5		Macbook 5,1

  mbp3		Macbook Pro rev3

  imac24	iMac 24'' with jack detection

  imac91	iMac 9,1

  w2jc		ASUS W2JC

  3stack-2ch-dig	3-jack with SPDIF I/O (ALC883)

  alc883-6stack-dig	6-jack digital with SPDIF I/O (ALC883)

sound/pci/hda/patch_realtek.c

+111 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ enum { 
	ALC885_MBP3,

	ALC885_MB5,

	ALC885_IMAC24,

	ALC885_IMAC91,

	ALC883_3ST_2ch_DIG,

	ALC883_3ST_6ch_DIG,

	ALC883_3ST_6ch,
@@ -7050,6 +7051,20 @@ static struct snd_kcontrol_new alc885_mb5_mixer[] = { 
	{ } /* end */

};













static struct snd_kcontrol_new alc885_imac91_mixer[] = {













	HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x0c, 0x00, HDA_OUTPUT),













	HDA_BIND_MUTE   ("Line-Out Playback Switch", 0x0c, 0x02, HDA_INPUT),













	HDA_CODEC_MUTE  ("Speaker Playback Switch", 0x14, 0x00, HDA_OUTPUT),













	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x00, HDA_OUTPUT),













	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, 0x00, HDA_INPUT),













	HDA_CODEC_MUTE  ("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT),













	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),













	{ } /* end */













};







































static struct snd_kcontrol_new alc882_w2jc_mixer[] = {















	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),















	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),










@@ -7505,6 +7520,66 @@ static struct hda_verb alc885_mbp3_init_verbs[] = {













	{ }















};



























/* iMac 9,1 */













static struct hda_verb alc885_imac91_init_verbs[] = {













	/* Line-Out mixer: unmute input/output amp left and right (volume = 0) */













	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},













	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},













	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},













	/* Rear mixer */













	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},













	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},













	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},













	/* HP Pin: output 0 (0x0c) */













	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},













	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},













	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},













	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},













	/* Internal Speakers: output 0 (0x0d) */













	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},













	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},













	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},













	/* Mic (rear) pin: input vref at 80% */













	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},













	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},













	/* Front Mic pin: input vref at 80% */













	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},













	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},













	/* Line In pin: use output 1 when in LineOut mode */













	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},













	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},













	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},

























	/* FIXME: use matrix-type input source selection */













	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */













	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */













	{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)},













	/* Input mixer2 */













	{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)},













	/* Input mixer3 */













	{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)},













	/* ADC1: mute amp left and right */













	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},













	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},













	/* ADC2: mute amp left and right */













	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},













	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},













	/* ADC3: mute amp left and right */













	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},













	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},

























	{ }













};



























/* iMac 24 mixer. */















static struct snd_kcontrol_new alc885_imac24_mixer[] = {















	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x00, HDA_OUTPUT),










@@ -7551,6 +7626,26 @@ static void alc885_mbp3_setup(struct hda_codec *codec)













	spec->autocfg.speaker_pins[0] = 0x14;















}



























static void alc885_imac91_automute(struct hda_codec *codec)













{













 	unsigned int present;

























	present = snd_hda_codec_read(codec, 0x14, 0,













				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;













	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,













				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);













	snd_hda_codec_amp_stereo(codec, 0x1a, HDA_OUTPUT, 0,













				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);

























}

























static void alc885_imac91_unsol_event(struct hda_codec *codec,













				    unsigned int res)













{













	/* Headphone insertion or removal. */













	if ((res >> 26) == ALC880_HP_EVENT)













		alc885_imac91_automute(codec);













}





























static struct hda_verb alc882_targa_verbs[] = {















	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},










@@ -8718,6 +8813,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {













	[ALC885_MB5]		= "mb5",















	[ALC885_MBP3]		= "mbp3",















	[ALC885_IMAC24]		= "imac24",













	[ALC885_IMAC91]		= "imac91",















	[ALC883_3ST_2ch_DIG]	= "3stack-2ch-dig",















	[ALC883_3ST_6ch_DIG]	= "3stack-6ch-dig",















	[ALC883_3ST_6ch]	= "3stack-6ch",










@@ -8891,6 +8987,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {













	SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31),















	SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3),















	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),















	/* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2,















	 * so apparently no perfect solution yet










@@ -9002,6 +9099,20 @@ static struct alc_config_preset alc882_presets[] = {













		.setup = alc885_imac24_setup,















		.init_hook = alc885_imac24_init_hook,















	},













	[ALC885_IMAC91] = {













		.mixers = { alc885_imac91_mixer, alc882_chmode_mixer },













		.init_verbs = { alc885_imac91_init_verbs,













				alc880_gpio1_init_verbs },













		.num_dacs = ARRAY_SIZE(alc882_dac_nids),













		.dac_nids = alc882_dac_nids,













		.channel_mode = alc885_mbp_4ch_modes,













		.num_channel_mode = ARRAY_SIZE(alc885_mbp_4ch_modes),













		.input_mux = &alc882_capture_source,













		.dig_out_nid = ALC882_DIGOUT_NID,













		.dig_in_nid = ALC882_DIGIN_NID,













		.unsol_event = alc885_imac91_unsol_event,













		.init_hook = alc885_imac91_automute,













	},















	[ALC882_TARGA] = {















		.mixers = { alc882_targa_mixer, alc882_chmode_mixer },















		.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE