From: Tobin Davis Subject: HDA-Intel: Fix headphone squeal on Conexant audio Date: Tue, 24 Apr 2007 09:21:52 -0700 Message-ID: <1177431712.4274.115.camel@razman.gruemaster.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-CwkEY1w7w2dnU5tO++Bu" Return-path: Received: from iron2.pdx.net (iron2.pdx.net [69.64.224.71]) by alsa0.perex.cz (Postfix) with ESMTP id 2DB0A24909 for ; Tue, 24 Apr 2007 18:21:58 +0200 (CEST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: ALSA Developers , Takashi Iwai List-Id: alsa-devel@alsa-project.org --=-CwkEY1w7w2dnU5tO++Bu Content-Type: text/plain Content-Transfer-Encoding: 7bit This patch fixes the headphone squeal and noise on Conexant CX20551 (Waikiki) audio. Signed off by Tobin Davis Wrong "From" email address selected earlier. Oops. --=-CwkEY1w7w2dnU5tO++Bu Content-Disposition: attachment; filename=conexant-test20.patch Content-Type: text/x-patch; name=conexant-test20.patch; charset=UTF-8 Content-Transfer-Encoding: 7bit diff -r 05d4738cc065 pci/hda/patch_conexant.c --- a/pci/hda/patch_conexant.c Mon Apr 23 17:17:48 2007 +0200 +++ b/pci/hda/patch_conexant.c Mon Apr 23 09:00:46 2007 -0700 @@ -993,22 +993,10 @@ static struct snd_kcontrol_new cxt5047_m HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT), HDA_CODEC_VOLUME("PCM-2 Volume", 0x1c, 0x00, HDA_OUTPUT), HDA_CODEC_MUTE("PCM-2 Switch", 0x1c, 0x00, HDA_OUTPUT), - { - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Master Playback Volume", - .info = snd_hda_mixer_amp_volume_info, - .get = snd_hda_mixer_amp_volume_get, - .put = cxt5047_hp_master_vol_put, - .private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT), - }, - { - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Master Playback Switch", - .info = cxt_eapd_info, - .get = cxt_eapd_get, - .put = cxt5047_hp_master_sw_put, - .private_value = 0x13, - }, + HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x00, HDA_OUTPUT), + HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x00, HDA_OUTPUT), + HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT), + HDA_CODEC_MUTE("Headphone Playback Switch", 0x13, 0x00, HDA_OUTPUT), {} }; @@ -1079,7 +1067,8 @@ static struct hda_verb cxt5047_init_verb {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 }, {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 }, /* HP, Speaker */ - {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, + {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, + {0x13, AC_VERB_SET_CONNECT_SEL,0x1}, {0x1d, AC_VERB_SET_CONNECT_SEL,0x0}, /* Record selector: Mic */ {0x12, AC_VERB_SET_CONNECT_SEL,0x03}, --=-CwkEY1w7w2dnU5tO++Bu Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel --=-CwkEY1w7w2dnU5tO++Bu--