From: Huacai Chen <chenhc@lemote.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: linux-mips@linux-mips.org, alsa-devel@alsa-project.org,
Zhangjin Wu <wuzhangjin@gmail.com>, Hua Yan <yanh@lemote.com>,
Jie Chen <chenj@lemote.com>,
linux-kernel@vger.kernel.org, Ralf Baechle <ralf@linux-mips.org>,
Fuxin Zhang <zhangfx@lemote.com>,
Hongliang Tao <taohl@lemote.com>
Subject: Re: [alsa-devel] [PATCH V7 12/15] ALSA: HDA: Make hda sound card usable for Loongson
Date: Thu, 11 Oct 2012 15:34:34 +0800 [thread overview]
Message-ID: <CAAhV-H4Mt+5uxAL870FdLTJenjCdg2_9fEzs4X3w6XW+dkq6Ng@mail.gmail.com> (raw)
In-Reply-To: <s5hy5jhjrty.wl%tiwai@suse.de>
On Mon, Oct 8, 2012 at 4:22 PM, Takashi Iwai <tiwai@suse.de> wrote:
> At Fri, 5 Oct 2012 21:25:09 +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 <chenj@lemote.com>
>> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>> Signed-off-by: Hongliang Tao <taohl@lemote.com>
>> Signed-off-by: Hua Yan <yanh@lemote.com>
>> Cc: alsa-devel@alsa-project.org
>
> Looks good to me.
>
> Is this intended to be taken into 3.7 kernel? Or it's a 3.8 kernel
> material?
>
> In anyway, the patch isn't intrusive and just fixups, so I can merge
> this in sound git tree at any time.
Please merge this patch in alsa tree first, since other patches of
this series need some more time to go mips tree, I don't want you to
be disturbed again and again.
Thanks.
>
>
> 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,
>> @@ -4444,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-devel@alsa-project.org
>> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2012-10-11 7:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 13:24 [PATCH V7 00/15] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-10-05 13:24 ` [PATCH V7 01/15] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
2012-10-05 13:24 ` [PATCH V7 02/15] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
2012-10-05 13:25 ` [PATCH V7 03/15] MIPS: Loongson: Introduce and use cpu_has_coherent_cache feature Huacai Chen
2012-10-05 13:25 ` [PATCH V7 04/15] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
2012-10-05 13:25 ` [PATCH V7 05/15] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2012-10-05 13:25 ` [PATCH V7 06/15] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2012-10-05 13:25 ` [PATCH V7 07/15] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2012-10-05 13:25 ` [PATCH V7 08/15] MIPS: Loongson 3: Add serial port support Huacai Chen
2012-10-05 13:25 ` [PATCH V7 09/15] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
2012-10-05 13:25 ` [PATCH V7 10/15] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
2012-10-05 13:25 ` [PATCH V7 11/15] drm: Handle io prot correctly for MIPS Huacai Chen
2012-10-05 13:25 ` [PATCH V7 12/15] ALSA: HDA: Make hda sound card usable for Loongson Huacai Chen
2012-10-08 8:22 ` [alsa-devel] " Takashi Iwai
2012-10-11 7:34 ` Huacai Chen [this message]
2012-10-05 13:25 ` [PATCH V7 13/15] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2012-10-05 13:25 ` [PATCH V7 14/15] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
2012-10-05 13:25 ` [PATCH V7 15/15] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAAhV-H4Mt+5uxAL870FdLTJenjCdg2_9fEzs4X3w6XW+dkq6Ng@mail.gmail.com \
--to=chenhc@lemote.com \
--cc=alsa-devel@alsa-project.org \
--cc=chenj@lemote.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=taohl@lemote.com \
--cc=tiwai@suse.de \
--cc=wuzhangjin@gmail.com \
--cc=yanh@lemote.com \
--cc=zhangfx@lemote.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).