At Mon, 14 Jun 2010 12:08:43 +0930,
murray.alex@xxxxxxxxx wrote:
>
> From: Alex Murray <murray.alex@xxxxxxxxx>
>
> The line-in input is 0x7 not 0x2 for MacBook (Pro) 5,1 / 5,2 models
>
> Signed-off-by: Alex Murray <murray.alex@xxxxxxxxx>
MB5 != MBP5, so I suspect this might be rather the incompatibility
between them...
Takashi
>
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 17d4548..007f96b 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -6948,7 +6948,7 @@ static struct hda_input_mux mb5_capture_source = {
> .num_items = 3,
> .items = {
> { "Mic", 0x1 },
> - { "Line", 0x2 },
> + { "Line", 0x7 },
> { "CD", 0x4 },
> },
> };
> @@ -7469,8 +7469,8 @@ static struct snd_kcontrol_new alc885_mb5_mixer[] = {
> HDA_BIND_MUTE ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT),
> HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0f, 0x00, HDA_OUTPUT),
> HDA_BIND_MUTE ("Headphone Playback Switch", 0x0f, 0x02, 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("Line Playback Volume", 0x0b, 0x07, HDA_INPUT),
> + HDA_CODEC_MUTE ("Line Playback Switch", 0x0b, 0x07, HDA_INPUT),
> HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
> HDA_CODEC_MUTE ("Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
> HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),
> @@ -7853,10 +7853,9 @@ static struct hda_verb alc885_mb5_init_verbs[] = {
> {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
> {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>
> - {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
> - {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)},
> + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0x1)},
> + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x7)},
> + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x4)},
> { }
> };
>
> --
> 1.7.0.4
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
