Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
At Fri, 09 Nov 2012 09:36:34 +0100, John Crispin wrote: > > On 17/08/12 11:09, Takashi Iwai wrote: > > At Fri, 17 Aug 2012 16:43:32 +0800, > > Huacai Chen wrote: > >> > > >> > Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, > >> > this patch modify patch_conexant.c to add Lemote specific code. > >> > > >> > Both A1004 and A1205 use the same pin configurations, but A1004 need > >> > to increase the default boost of internal mic. > >> > > >> > Signed-off-by: Jie Chen > >> > Signed-off-by: Huacai Chen > >> > Signed-off-by: Hongliang Tao > >> > Signed-off-by: Hua Yan > >> > Cc:alsa-de...@alsa-project.org > > Looks good. > > Reviewed-by: Takashi Iwai > > > > Should I apply it to sound git tree or all patches will go through > > mips tree? > > > > > > thanks, > > > > Takashi > > > > > Hi Takashi, > > did you take this patch ? I will queue several of the other patches from > the series for 3.8 and let them go upstream via the mips tree. We have > this patch open in the linux-mips patchwork. I would set it to "Other > Subsystem" if you took it already. Yes, this was already merged in sound git tree for 3.8. thanks, Takashi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
On 17/08/12 11:09, Takashi Iwai wrote: At Fri, 17 Aug 2012 16:43:32 +0800, Huacai Chen wrote: > > Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, > this patch modify patch_conexant.c to add Lemote specific code. > > Both A1004 and A1205 use the same pin configurations, but A1004 need > to increase the default boost of internal mic. > > Signed-off-by: Jie Chen > Signed-off-by: Huacai Chen > Signed-off-by: Hongliang Tao > Signed-off-by: Hua Yan > Cc:alsa-de...@alsa-project.org Looks good. Reviewed-by: Takashi Iwai Should I apply it to sound git tree or all patches will go through mips tree? thanks, Takashi Hi Takashi, did you take this patch ? I will queue several of the other patches from the series for 3.8 and let them go upstream via the mips tree. We have this patch open in the linux-mips patchwork. I would set it to "Other Subsystem" if you took it already. Thanks, John -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
On 17/08/12 11:09, Takashi Iwai wrote: At Fri, 17 Aug 2012 16:43:32 +0800, Huacai Chen wrote: Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, this patch modify patch_conexant.c to add Lemote specific code. Both A1004 and A1205 use the same pin configurations, but A1004 need to increase the default boost of internal mic. Signed-off-by: Jie Chench...@lemote.com Signed-off-by: Huacai Chenche...@lemote.com Signed-off-by: Hongliang Taota...@lemote.com Signed-off-by: Hua Yany...@lemote.com Cc:alsa-de...@alsa-project.org Looks good. Reviewed-by: Takashi Iwaiti...@suse.de Should I apply it to sound git tree or all patches will go through mips tree? thanks, Takashi Hi Takashi, did you take this patch ? I will queue several of the other patches from the series for 3.8 and let them go upstream via the mips tree. We have this patch open in the linux-mips patchwork. I would set it to Other Subsystem if you took it already. Thanks, John -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
At Fri, 09 Nov 2012 09:36:34 +0100, John Crispin wrote: On 17/08/12 11:09, Takashi Iwai wrote: At Fri, 17 Aug 2012 16:43:32 +0800, Huacai Chen wrote: Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, this patch modify patch_conexant.c to add Lemote specific code. Both A1004 and A1205 use the same pin configurations, but A1004 need to increase the default boost of internal mic. Signed-off-by: Jie Chench...@lemote.com Signed-off-by: Huacai Chenche...@lemote.com Signed-off-by: Hongliang Taota...@lemote.com Signed-off-by: Hua Yany...@lemote.com Cc:alsa-de...@alsa-project.org Looks good. Reviewed-by: Takashi Iwaiti...@suse.de Should I apply it to sound git tree or all patches will go through mips tree? thanks, Takashi Hi Takashi, did you take this patch ? I will queue several of the other patches from the series for 3.8 and let them go upstream via the mips tree. We have this patch open in the linux-mips patchwork. I would set it to Other Subsystem if you took it already. Yes, this was already merged in sound git tree for 3.8. thanks, Takashi -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
I think they will go through mips tree. On Fri, Aug 17, 2012 at 5:09 PM, Takashi Iwai wrote: > At Fri, 17 Aug 2012 16:43:32 +0800, > Huacai Chen wrote: >> >> Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, >> this patch modify patch_conexant.c to add Lemote specific code. >> >> Both A1004 and A1205 use the same pin configurations, but A1004 need >> to increase the default boost of internal mic. >> >> Signed-off-by: Jie Chen >> Signed-off-by: Huacai Chen >> Signed-off-by: Hongliang Tao >> Signed-off-by: Hua Yan >> Cc: alsa-de...@alsa-project.org > > Looks good. > Reviewed-by: Takashi Iwai > > Should I apply it to sound git tree or all patches will go through > mips tree? > > > thanks, > > Takashi > >> --- >> sound/pci/hda/patch_conexant.c | 44 >> >> 1 files changed, 44 insertions(+), 0 deletions(-) >> >> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c >> index 5e22a8f..3cc265e 100644 >> --- a/sound/pci/hda/patch_conexant.c >> +++ b/sound/pci/hda/patch_conexant.c >> @@ -4408,7 +4408,10 @@ static const struct hda_codec_ops cx_auto_patch_ops = >> { >> enum { >> CXT_PINCFG_LENOVO_X200, >> CXT_PINCFG_LENOVO_TP410, >> + CXT_PINCFG_LEMOTE_A1004, >> + CXT_PINCFG_LEMOTE_A1205, >> CXT_FIXUP_STEREO_DMIC, >> + CXT_FIXUP_INC_MIC_BOOST, >> }; >> >> static void cxt_fixup_stereo_dmic(struct hda_codec *codec, >> @@ -4418,6 +4421,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec >> *codec, >> spec->fixup_stereo_dmic = 1; >> } >> >> +static void cxt5066_increase_mic_boost(struct hda_codec *codec, >> +const struct hda_fixup *fix, int action) >> +{ >> + if (action != HDA_FIXUP_ACT_PRE_PROBE) >> + return; >> + >> + snd_hda_override_amp_caps(codec, 0x17, HDA_OUTPUT, >> + (0x3 << AC_AMPCAP_OFFSET_SHIFT) | >> + (0x4 << AC_AMPCAP_NUM_STEPS_SHIFT) | >> + (0x27 << AC_AMPCAP_STEP_SIZE_SHIFT) | >> + (0 << AC_AMPCAP_MUTE_SHIFT)); >> +} >> + >> /* ThinkPad X200 & co with cxt5051 */ >> static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = { >> { 0x16, 0x042140ff }, /* HP (seq# overridden) */ >> @@ -4435,6 +4451,18 @@ static const struct hda_pintbl >> cxt_pincfg_lenovo_tp410[] = { >> {} >> }; >> >> +/* Lemote A1004/A1205 with cxt5066 */ >> +static const struct hda_pintbl cxt_pincfg_lemote[] = { >> + { 0x1a, 0x90a10020 }, /* Internal mic */ >> + { 0x1b, 0x03a11020 }, /* External mic */ >> + { 0x1d, 0x400101f0 }, /* Not used */ >> + { 0x1e, 0x40a701f0 }, /* Not used */ >> + { 0x20, 0x404501f0 }, /* Not used */ >> + { 0x22, 0x404401f0 }, /* Not used */ >> + { 0x23, 0x40a701f0 }, /* Not used */ >> + {} >> +}; >> + >> static const struct hda_fixup cxt_fixups[] = { >> [CXT_PINCFG_LENOVO_X200] = { >> .type = HDA_FIXUP_PINS, >> @@ -,10 +4472,24 @@ static const struct hda_fixup cxt_fixups[] = { >> .type = HDA_FIXUP_PINS, >> .v.pins = cxt_pincfg_lenovo_tp410, >> }, >> + [CXT_PINCFG_LEMOTE_A1004] = { >> + .type = HDA_FIXUP_PINS, >> + .chained = true, >> + .chain_id = CXT_FIXUP_INC_MIC_BOOST, >> + .v.pins = cxt_pincfg_lemote, >> + }, >> + [CXT_PINCFG_LEMOTE_A1205] = { >> + .type = HDA_FIXUP_PINS, >> + .v.pins = cxt_pincfg_lemote, >> + }, >> [CXT_FIXUP_STEREO_DMIC] = { >> .type = HDA_FIXUP_FUNC, >> .v.func = cxt_fixup_stereo_dmic, >> }, >> + [CXT_FIXUP_INC_MIC_BOOST] = { >> + .type = HDA_FIXUP_FUNC, >> + .v.func = cxt5066_increase_mic_boost, >> + }, >> }; >> >> static const struct snd_pci_quirk cxt5051_fixups[] = { >> @@ -4463,6 +4505,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { >> SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410), >> SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), >> SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), >> + SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004), >> + SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205), >> {} >> }; >> >> -- >> 1.7.7.3 >> >> ___ >> Alsa-devel mailing list >> alsa-de...@alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> > ___ > Alsa-devel mailing list > alsa-de...@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
At Fri, 17 Aug 2012 16:43:32 +0800, Huacai Chen wrote: > > Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, > this patch modify patch_conexant.c to add Lemote specific code. > > Both A1004 and A1205 use the same pin configurations, but A1004 need > to increase the default boost of internal mic. > > Signed-off-by: Jie Chen > Signed-off-by: Huacai Chen > Signed-off-by: Hongliang Tao > Signed-off-by: Hua Yan > Cc: alsa-de...@alsa-project.org Looks good. Reviewed-by: Takashi Iwai Should I apply it to sound git tree or all patches will go through mips tree? thanks, Takashi > --- > sound/pci/hda/patch_conexant.c | 44 > > 1 files changed, 44 insertions(+), 0 deletions(-) > > diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c > index 5e22a8f..3cc265e 100644 > --- a/sound/pci/hda/patch_conexant.c > +++ b/sound/pci/hda/patch_conexant.c > @@ -4408,7 +4408,10 @@ static const struct hda_codec_ops cx_auto_patch_ops = { > enum { > CXT_PINCFG_LENOVO_X200, > CXT_PINCFG_LENOVO_TP410, > + CXT_PINCFG_LEMOTE_A1004, > + CXT_PINCFG_LEMOTE_A1205, > CXT_FIXUP_STEREO_DMIC, > + CXT_FIXUP_INC_MIC_BOOST, > }; > > static void cxt_fixup_stereo_dmic(struct hda_codec *codec, > @@ -4418,6 +4421,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec > *codec, > spec->fixup_stereo_dmic = 1; > } > > +static void cxt5066_increase_mic_boost(struct hda_codec *codec, > +const struct hda_fixup *fix, int action) > +{ > + if (action != HDA_FIXUP_ACT_PRE_PROBE) > + return; > + > + snd_hda_override_amp_caps(codec, 0x17, HDA_OUTPUT, > + (0x3 << AC_AMPCAP_OFFSET_SHIFT) | > + (0x4 << AC_AMPCAP_NUM_STEPS_SHIFT) | > + (0x27 << AC_AMPCAP_STEP_SIZE_SHIFT) | > + (0 << AC_AMPCAP_MUTE_SHIFT)); > +} > + > /* ThinkPad X200 & co with cxt5051 */ > static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = { > { 0x16, 0x042140ff }, /* HP (seq# overridden) */ > @@ -4435,6 +4451,18 @@ static const struct hda_pintbl > cxt_pincfg_lenovo_tp410[] = { > {} > }; > > +/* Lemote A1004/A1205 with cxt5066 */ > +static const struct hda_pintbl cxt_pincfg_lemote[] = { > + { 0x1a, 0x90a10020 }, /* Internal mic */ > + { 0x1b, 0x03a11020 }, /* External mic */ > + { 0x1d, 0x400101f0 }, /* Not used */ > + { 0x1e, 0x40a701f0 }, /* Not used */ > + { 0x20, 0x404501f0 }, /* Not used */ > + { 0x22, 0x404401f0 }, /* Not used */ > + { 0x23, 0x40a701f0 }, /* Not used */ > + {} > +}; > + > static const struct hda_fixup cxt_fixups[] = { > [CXT_PINCFG_LENOVO_X200] = { > .type = HDA_FIXUP_PINS, > @@ -,10 +4472,24 @@ static const struct hda_fixup cxt_fixups[] = { > .type = HDA_FIXUP_PINS, > .v.pins = cxt_pincfg_lenovo_tp410, > }, > + [CXT_PINCFG_LEMOTE_A1004] = { > + .type = HDA_FIXUP_PINS, > + .chained = true, > + .chain_id = CXT_FIXUP_INC_MIC_BOOST, > + .v.pins = cxt_pincfg_lemote, > + }, > + [CXT_PINCFG_LEMOTE_A1205] = { > + .type = HDA_FIXUP_PINS, > + .v.pins = cxt_pincfg_lemote, > + }, > [CXT_FIXUP_STEREO_DMIC] = { > .type = HDA_FIXUP_FUNC, > .v.func = cxt_fixup_stereo_dmic, > }, > + [CXT_FIXUP_INC_MIC_BOOST] = { > + .type = HDA_FIXUP_FUNC, > + .v.func = cxt5066_increase_mic_boost, > + }, > }; > > static const struct snd_pci_quirk cxt5051_fixups[] = { > @@ -4463,6 +4505,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { > SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410), > SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), > SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), > + SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004), > + SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205), > {} > }; > > -- > 1.7.7.3 > > ___ > Alsa-devel mailing list > alsa-de...@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
At Fri, 17 Aug 2012 16:43:32 +0800, Huacai Chen wrote: Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, this patch modify patch_conexant.c to add Lemote specific code. Both A1004 and A1205 use the same pin configurations, but A1004 need to increase the default boost of internal mic. Signed-off-by: Jie Chen ch...@lemote.com Signed-off-by: Huacai Chen che...@lemote.com Signed-off-by: Hongliang Tao ta...@lemote.com Signed-off-by: Hua Yan y...@lemote.com Cc: alsa-de...@alsa-project.org Looks good. Reviewed-by: Takashi Iwai ti...@suse.de Should I apply it to sound git tree or all patches will go through mips tree? thanks, Takashi --- sound/pci/hda/patch_conexant.c | 44 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 5e22a8f..3cc265e 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -4408,7 +4408,10 @@ static const struct hda_codec_ops cx_auto_patch_ops = { enum { CXT_PINCFG_LENOVO_X200, CXT_PINCFG_LENOVO_TP410, + CXT_PINCFG_LEMOTE_A1004, + CXT_PINCFG_LEMOTE_A1205, CXT_FIXUP_STEREO_DMIC, + CXT_FIXUP_INC_MIC_BOOST, }; static void cxt_fixup_stereo_dmic(struct hda_codec *codec, @@ -4418,6 +4421,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec, spec-fixup_stereo_dmic = 1; } +static void cxt5066_increase_mic_boost(struct hda_codec *codec, +const struct hda_fixup *fix, int action) +{ + if (action != HDA_FIXUP_ACT_PRE_PROBE) + return; + + snd_hda_override_amp_caps(codec, 0x17, HDA_OUTPUT, + (0x3 AC_AMPCAP_OFFSET_SHIFT) | + (0x4 AC_AMPCAP_NUM_STEPS_SHIFT) | + (0x27 AC_AMPCAP_STEP_SIZE_SHIFT) | + (0 AC_AMPCAP_MUTE_SHIFT)); +} + /* ThinkPad X200 co with cxt5051 */ static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = { { 0x16, 0x042140ff }, /* HP (seq# overridden) */ @@ -4435,6 +4451,18 @@ static const struct hda_pintbl cxt_pincfg_lenovo_tp410[] = { {} }; +/* Lemote A1004/A1205 with cxt5066 */ +static const struct hda_pintbl cxt_pincfg_lemote[] = { + { 0x1a, 0x90a10020 }, /* Internal mic */ + { 0x1b, 0x03a11020 }, /* External mic */ + { 0x1d, 0x400101f0 }, /* Not used */ + { 0x1e, 0x40a701f0 }, /* Not used */ + { 0x20, 0x404501f0 }, /* Not used */ + { 0x22, 0x404401f0 }, /* Not used */ + { 0x23, 0x40a701f0 }, /* Not used */ + {} +}; + static const struct hda_fixup cxt_fixups[] = { [CXT_PINCFG_LENOVO_X200] = { .type = HDA_FIXUP_PINS, @@ -,10 +4472,24 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_PINS, .v.pins = cxt_pincfg_lenovo_tp410, }, + [CXT_PINCFG_LEMOTE_A1004] = { + .type = HDA_FIXUP_PINS, + .chained = true, + .chain_id = CXT_FIXUP_INC_MIC_BOOST, + .v.pins = cxt_pincfg_lemote, + }, + [CXT_PINCFG_LEMOTE_A1205] = { + .type = HDA_FIXUP_PINS, + .v.pins = cxt_pincfg_lemote, + }, [CXT_FIXUP_STEREO_DMIC] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_stereo_dmic, }, + [CXT_FIXUP_INC_MIC_BOOST] = { + .type = HDA_FIXUP_FUNC, + .v.func = cxt5066_increase_mic_boost, + }, }; static const struct snd_pci_quirk cxt5051_fixups[] = { @@ -4463,6 +4505,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x17aa, 0x21cf, Lenovo T520, CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x3975, Lenovo U300s, CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x397b, Lenovo S205, CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1c06, 0x2011, Lemote A1004, CXT_PINCFG_LEMOTE_A1004), + SND_PCI_QUIRK(0x1c06, 0x2012, Lemote A1205, CXT_PINCFG_LEMOTE_A1205), {} }; -- 1.7.7.3 ___ Alsa-devel mailing list alsa-de...@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
I think they will go through mips tree. On Fri, Aug 17, 2012 at 5:09 PM, Takashi Iwai ti...@suse.de wrote: At Fri, 17 Aug 2012 16:43:32 +0800, Huacai Chen wrote: Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, this patch modify patch_conexant.c to add Lemote specific code. Both A1004 and A1205 use the same pin configurations, but A1004 need to increase the default boost of internal mic. Signed-off-by: Jie Chen ch...@lemote.com Signed-off-by: Huacai Chen che...@lemote.com Signed-off-by: Hongliang Tao ta...@lemote.com Signed-off-by: Hua Yan y...@lemote.com Cc: alsa-de...@alsa-project.org Looks good. Reviewed-by: Takashi Iwai ti...@suse.de Should I apply it to sound git tree or all patches will go through mips tree? thanks, Takashi --- sound/pci/hda/patch_conexant.c | 44 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 5e22a8f..3cc265e 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -4408,7 +4408,10 @@ static const struct hda_codec_ops cx_auto_patch_ops = { enum { CXT_PINCFG_LENOVO_X200, CXT_PINCFG_LENOVO_TP410, + CXT_PINCFG_LEMOTE_A1004, + CXT_PINCFG_LEMOTE_A1205, CXT_FIXUP_STEREO_DMIC, + CXT_FIXUP_INC_MIC_BOOST, }; static void cxt_fixup_stereo_dmic(struct hda_codec *codec, @@ -4418,6 +4421,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec, spec-fixup_stereo_dmic = 1; } +static void cxt5066_increase_mic_boost(struct hda_codec *codec, +const struct hda_fixup *fix, int action) +{ + if (action != HDA_FIXUP_ACT_PRE_PROBE) + return; + + snd_hda_override_amp_caps(codec, 0x17, HDA_OUTPUT, + (0x3 AC_AMPCAP_OFFSET_SHIFT) | + (0x4 AC_AMPCAP_NUM_STEPS_SHIFT) | + (0x27 AC_AMPCAP_STEP_SIZE_SHIFT) | + (0 AC_AMPCAP_MUTE_SHIFT)); +} + /* ThinkPad X200 co with cxt5051 */ static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = { { 0x16, 0x042140ff }, /* HP (seq# overridden) */ @@ -4435,6 +4451,18 @@ static const struct hda_pintbl cxt_pincfg_lenovo_tp410[] = { {} }; +/* Lemote A1004/A1205 with cxt5066 */ +static const struct hda_pintbl cxt_pincfg_lemote[] = { + { 0x1a, 0x90a10020 }, /* Internal mic */ + { 0x1b, 0x03a11020 }, /* External mic */ + { 0x1d, 0x400101f0 }, /* Not used */ + { 0x1e, 0x40a701f0 }, /* Not used */ + { 0x20, 0x404501f0 }, /* Not used */ + { 0x22, 0x404401f0 }, /* Not used */ + { 0x23, 0x40a701f0 }, /* Not used */ + {} +}; + static const struct hda_fixup cxt_fixups[] = { [CXT_PINCFG_LENOVO_X200] = { .type = HDA_FIXUP_PINS, @@ -,10 +4472,24 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_PINS, .v.pins = cxt_pincfg_lenovo_tp410, }, + [CXT_PINCFG_LEMOTE_A1004] = { + .type = HDA_FIXUP_PINS, + .chained = true, + .chain_id = CXT_FIXUP_INC_MIC_BOOST, + .v.pins = cxt_pincfg_lemote, + }, + [CXT_PINCFG_LEMOTE_A1205] = { + .type = HDA_FIXUP_PINS, + .v.pins = cxt_pincfg_lemote, + }, [CXT_FIXUP_STEREO_DMIC] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_stereo_dmic, }, + [CXT_FIXUP_INC_MIC_BOOST] = { + .type = HDA_FIXUP_FUNC, + .v.func = cxt5066_increase_mic_boost, + }, }; static const struct snd_pci_quirk cxt5051_fixups[] = { @@ -4463,6 +4505,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x17aa, 0x21cf, Lenovo T520, CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x3975, Lenovo U300s, CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x397b, Lenovo S205, CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1c06, 0x2011, Lemote A1004, CXT_PINCFG_LEMOTE_A1004), + SND_PCI_QUIRK(0x1c06, 0x2012, Lemote A1205, CXT_PINCFG_LEMOTE_A1205), {} }; -- 1.7.7.3 ___ Alsa-devel mailing list alsa-de...@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ___ Alsa-devel mailing list alsa-de...@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/