At Thu, 02 Sep 2010 10:53:32 +0200, David Henningsson wrote: > > 2010-09-02 10:26, Takashi Iwai skrev: > > At Thu, 02 Sep 2010 08:47:50 +0200, > > David Henningsson wrote: > >> > >> This new model adds the following functionality to HP G60: > >> - Automute of internal speakers > >> - Autoswitch of internal/external mics > >> - Remove SPDIF not physically present > >> > >> BugLink: http://launchpad.net/bugs/587388 > >> Cc: stable@xxxxxxxxxx > >> Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx> > >> > >> Alsa-info: > >> http://launchpadlibrarian.net/54727125/alsa-info.txt_internalmicworking > > > > Thanks for the patch. > > > > The change looks good to me, but could you fix errors reported by > > checkpatch.pl and repost? > > Sure. I let one 80+ warning stay because I thought it'd look ugly and > less consistent with the 80+ surroundings otherwise. Let me know if > you'd like me to fix that one as well. That's fine. I applied it now. Thanks. Takashi > > -- > David Henningsson, Canonical Ltd. > http://launchpad.net/~diwic > [2 0001-Add-a-new-hp-laptop-model-for-Conexant-5066-tested-o.patch <text/x-patch (7bit)>] > >From 1b850c22e102f152d48bbde552e202fe24d9d6f3 Mon Sep 17 00:00:00 2001 > From: David Henningsson <david.henningsson@xxxxxxxxxxxxx> > Date: Thu, 2 Sep 2010 08:35:47 +0200 > Subject: [PATCH] Add a new hp-laptop model for Conexant 5066, tested on HP G60 > > This new model adds the following functionality to HP G60: > - Automute of internal speakers > - Autoswitch of internal/external mics > - Remove SPDIF not physically present > > BugLink: http://launchpad.net/bugs/587388 > Cc: stable@xxxxxxxxxx > Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx> > --- > Documentation/sound/alsa/HD-Audio-Models.txt | 1 + > sound/pci/hda/patch_conexant.c | 57 ++++++++++++++++++++++++++ > 2 files changed, 58 insertions(+), 0 deletions(-) > > diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt > index ce46fa1..d30ba75 100644 > --- a/Documentation/sound/alsa/HD-Audio-Models.txt > +++ b/Documentation/sound/alsa/HD-Audio-Models.txt > @@ -296,6 +296,7 @@ Conexant 5051 > Conexant 5066 > ============= > laptop Basic Laptop config (default) > + hp-laptop HP laptops, e g G60 > dell-laptop Dell laptops > dell-vostro Dell Vostro > olpc-xo-1_5 OLPC XO 1.5 > diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c > index 5cdb80e..0c46076 100644 > --- a/sound/pci/hda/patch_conexant.c > +++ b/sound/pci/hda/patch_conexant.c > @@ -116,6 +116,7 @@ struct conexant_spec { > unsigned int dell_vostro:1; > unsigned int ideapad:1; > unsigned int thinkpad:1; > + unsigned int hp_laptop:1; > > unsigned int ext_mic_present; > unsigned int recording; > @@ -2299,6 +2300,18 @@ static void cxt5066_ideapad_automic(struct hda_codec *codec) > } > } > > +/* toggle input of built-in digital mic and mic jack appropriately */ > +static void cxt5066_hp_laptop_automic(struct hda_codec *codec) > +{ > + unsigned int present; > + > + present = snd_hda_jack_detect(codec, 0x1b); > + snd_printdd("CXT5066: external microphone present=%d\n", present); > + snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_CONNECT_SEL, > + present ? 1 : 3); > +} > + > + > /* toggle input of built-in digital mic and mic jack appropriately > order is: external mic -> dock mic -> interal mic */ > static void cxt5066_thinkpad_automic(struct hda_codec *codec) > @@ -2408,6 +2421,20 @@ static void cxt5066_ideapad_event(struct hda_codec *codec, unsigned int res) > } > > /* unsolicited event for jack sensing */ > +static void cxt5066_hp_laptop_event(struct hda_codec *codec, unsigned int res) > +{ > + snd_printdd("CXT5066_hp_laptop: unsol event %x (%x)\n", res, res >> 26); > + switch (res >> 26) { > + case CONEXANT_HP_EVENT: > + cxt5066_hp_automute(codec); > + break; > + case CONEXANT_MIC_EVENT: > + cxt5066_hp_laptop_automic(codec); > + break; > + } > +} > + > +/* unsolicited event for jack sensing */ > static void cxt5066_thinkpad_event(struct hda_codec *codec, unsigned int res) > { > snd_printdd("CXT5066_thinkpad: unsol event %x (%x)\n", res, res >> 26); > @@ -2989,6 +3016,14 @@ static struct hda_verb cxt5066_init_verbs_portd_lo[] = { > { } /* end */ > }; > > + > +static struct hda_verb cxt5066_init_verbs_hp_laptop[] = { > + {0x14, AC_VERB_SET_CONNECT_SEL, 0x0}, > + {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT}, > + {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT}, > + { } /* end */ > +}; > + > /* initialize jack-sensing, too */ > static int cxt5066_init(struct hda_codec *codec) > { > @@ -3004,6 +3039,8 @@ static int cxt5066_init(struct hda_codec *codec) > cxt5066_ideapad_automic(codec); > else if (spec->thinkpad) > cxt5066_thinkpad_automic(codec); > + else if (spec->hp_laptop) > + cxt5066_hp_laptop_automic(codec); > } > cxt5066_set_mic_boost(codec); > return 0; > @@ -3031,6 +3068,7 @@ enum { > CXT5066_DELL_VOSTO, /* Dell Vostro 1015i */ > CXT5066_IDEAPAD, /* Lenovo IdeaPad U150 */ > CXT5066_THINKPAD, /* Lenovo ThinkPad T410s, others? */ > + CXT5066_HP_LAPTOP, /* HP Laptop */ > CXT5066_MODELS > }; > > @@ -3041,6 +3079,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = { > [CXT5066_DELL_VOSTO] = "dell-vostro", > [CXT5066_IDEAPAD] = "ideapad", > [CXT5066_THINKPAD] = "thinkpad", > + [CXT5066_HP_LAPTOP] = "hp-laptop", > }; > > static struct snd_pci_quirk cxt5066_cfg_tbl[] = { > @@ -3052,6 +3091,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { > SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTO), > SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO), > SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD), > + SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP), > SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5), > SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5), > SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD), > @@ -3116,6 +3156,23 @@ static int patch_cxt5066(struct hda_codec *codec) > spec->num_init_verbs++; > spec->dell_automute = 1; > break; > + case CXT5066_HP_LAPTOP: > + codec->patch_ops.init = cxt5066_init; > + codec->patch_ops.unsol_event = cxt5066_hp_laptop_event; > + spec->init_verbs[spec->num_init_verbs] = > + cxt5066_init_verbs_hp_laptop; > + spec->num_init_verbs++; > + spec->hp_laptop = 1; > + spec->mixers[spec->num_mixers++] = cxt5066_mixer_master; > + spec->mixers[spec->num_mixers++] = cxt5066_mixers; > + /* no S/PDIF out */ > + spec->multiout.dig_out_nid = 0; > + /* input source automatically selected */ > + spec->input_mux = NULL; > + spec->port_d_mode = 0; > + spec->mic_boost = 3; /* default 30dB gain */ > + break; > + > case CXT5066_OLPC_XO_1_5: > codec->patch_ops.init = cxt5066_olpc_init; > codec->patch_ops.unsol_event = cxt5066_olpc_unsol_event; > -- > 1.7.0.4 > _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
