Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca169cc2 authored by Kailang Yang's avatar Kailang Yang Committed by Takashi Iwai
Browse files

ALSA: hda/realtek - Add Dual Codecs support for Lenovo P520/420 



Lenovo P520/420 build with two codecs.
ALC233 for front panel.
ALC662 for rear panel.
This patch will rename capture name for slove conflicts.
And create a card longname for UCM profile.

Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 610793fe

sound/pci/hda/patch_realtek.c

+36 −0
Original line number Original line Diff line number Diff line
@@ -4824,6 +4824,30 @@ static void alc280_fixup_hp_9480m(struct hda_codec *codec, 
	}

	}

}

}





static void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec,

					 const struct hda_fixup *fix,

					 int action)

{

	alc_fixup_dual_codecs(codec, fix, action);

	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		/* override card longname to provide a unique UCM profile */

		strcpy(codec->card->longname, "HDAudio-Lenovo-DualCodecs");

		break;

	case HDA_FIXUP_ACT_BUILD:

		/* rename Capture controls depending on the codec */

		rename_ctl(codec, "Capture Volume",

			   codec->addr == 0 ?

			   "Rear-Panel Capture Volume" :

			   "Front-Panel Capture Volume");

		rename_ctl(codec, "Capture Switch",

			   codec->addr == 0 ?

			   "Rear-Panel Capture Switch" :

			   "Front-Panel Capture Switch");

		break;

	}

}



/* for hda_fixup_thinkpad_acpi() */

/* for hda_fixup_thinkpad_acpi() */

#include "thinkpad_helper.c"

#include "thinkpad_helper.c"
@@ -4937,6 +4961,7 @@ enum { 
	ALC256_FIXUP_ASUS_AIO_GPIO2,

	ALC256_FIXUP_ASUS_AIO_GPIO2,

	ALC233_FIXUP_ASUS_MIC_NO_PRESENCE,

	ALC233_FIXUP_ASUS_MIC_NO_PRESENCE,

	ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE,

	ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE,

	ALC233_FIXUP_LENOVO_MULTI_CODECS,

};

};





static const struct hda_fixup alc269_fixups[] = {

static const struct hda_fixup alc269_fixups[] = {
@@ -5706,6 +5731,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chained = true,

		.chain_id = ALC233_FIXUP_ASUS_MIC_NO_PRESENCE

		.chain_id = ALC233_FIXUP_ASUS_MIC_NO_PRESENCE

	},

	},

	[ALC233_FIXUP_LENOVO_MULTI_CODECS] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc233_alc662_fixup_lenovo_dual_codecs,

	},

};

};





static const struct snd_pci_quirk alc269_fixup_tbl[] = {

static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -5860,6 +5889,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),

	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),

	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
@@ -6881,6 +6911,7 @@ enum { 
	ALC892_FIXUP_ASROCK_MOBO,

	ALC892_FIXUP_ASROCK_MOBO,

	ALC662_FIXUP_USI_FUNC,

	ALC662_FIXUP_USI_FUNC,

	ALC662_FIXUP_USI_HEADSET_MODE,

	ALC662_FIXUP_USI_HEADSET_MODE,

	ALC662_FIXUP_LENOVO_MULTI_CODECS,

};

};





static const struct hda_fixup alc662_fixups[] = {

static const struct hda_fixup alc662_fixups[] = {
@@ -7186,6 +7217,10 @@ static const struct hda_fixup alc662_fixups[] = { 
		.chained = true,

		.chained = true,

		.chain_id = ALC662_FIXUP_USI_FUNC

		.chain_id = ALC662_FIXUP_USI_FUNC

	},

	},

	[ALC662_FIXUP_LENOVO_MULTI_CODECS] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc233_alc662_fixup_lenovo_dual_codecs,

	},

};

};





static const struct snd_pci_quirk alc662_fixup_tbl[] = {

static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -7223,6 +7258,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),

	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),

	SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x14cd, 0x5003, "USI", ALC662_FIXUP_USI_HEADSET_MODE),

	SND_PCI_QUIRK(0x14cd, 0x5003, "USI", ALC662_FIXUP_USI_HEADSET_MODE),

	SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC662_FIXUP_LENOVO_MULTI_CODECS),

	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO),

	SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO),