FAILED: patch "[PATCH] ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass" failed to apply to 5.4-stable tree

PATCH [email protected] 3 participants 4 messages Jan 6, 2020 – Jan 7, 2020

Subsystems (2)

Stable branch Sound

lore

Share & tools

lore

[email protected]

author maintainer

2020-01-06 12:10 UTC #0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From e79c22695abd3b75a6aecf4ea4b9607e8d82c49c Mon Sep 17 00:00:00 2001
From: Kailang Yang <[email protected]>
Date: Thu, 19 Dec 2019 14:12:15 +0800
Subject: [PATCH] ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass
speaker

Dell has new platform which has dual speaker connecting. They want dual speaker which use same dac for output.

Signed-off-by Kailang Yang <[email protected]>

Cc <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Takashi Iwai <[email protected]>

sound/pci/hda/patch_realtek.c +19 -0

index 5bc1a6d24333..2ee703c2da78 100644
@@ -5908,6 +5908,8 @@ enum {
 	ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC,
 	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,
 	ALC294_FIXUP_ASUS_INTSPK_GPIO,
+	ALC289_FIXUP_DELL_SPK2,
+	ALC289_FIXUP_DUAL_SPK,
 };
 
 static const struct hda_fixup alc269_fixups[] = {

@@ -7009,6 +7011,21 @@ static const struct hda_fixup alc269_fixups[] = {
 		.chained = true,
 		.chain_id = ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC
 	},
+	[ALC289_FIXUP_DELL_SPK2] = {
+		.type = HDA_FIXUP_PINS,
+		.v.pins = (const struct hda_pintbl[]) {
+			{ 0x17, 0x90170130 }, /* bass spk */
+			{ }
+		},
+		.chained = true,
+		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE
+	},
+	[ALC289_FIXUP_DUAL_SPK] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc285_fixup_speaker2_to_dac1,
+		.chained = true,
+		.chain_id = ALC289_FIXUP_DELL_SPK2
+	},
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {

@@ -7081,6 +7098,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
+	SND_PCI_QUIRK(0x1028, 0x097e, "Dell Precision", ALC289_FIXUP_DUAL_SPK),
+	SND_PCI_QUIRK(0x1028, 0x097d, "Dell Precision", ALC289_FIXUP_DUAL_SPK),
 	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),

Takashi Iwai

2020-01-06 20:32 UTC #1 lore raw

Quoted 6 lines · On Mon, 06 Jan 2020 13:10:30 +0100, <[email protected]> wrote:

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Hm, I could cherry-pick the commit e79c22695abd (also commit 48e01504cf53 at next) cleanly on linux-5.4.y branch.

Could you try again?

thanks,

Takashi

Quoted 66 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From e79c22695abd3b75a6aecf4ea4b9607e8d82c49c Mon Sep 17 00:00:00 2001

From: Kailang Yang <[email protected]>
Date: Thu, 19 Dec 2019 14:12:15 +0800
Subject: [PATCH] ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass
speaker

Dell has new platform which has dual speaker connecting. They want dual speaker which use same dac for output.

Signed-off-by Kailang Yang <[email protected]>

Cc <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Takashi Iwai <[email protected]>

sound/pci/hda/patch_realtek.c +19 -0

index 5bc1a6d24333..2ee703c2da78 100644
@@ -5908,6 +5908,8 @@ enum {
 	ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC,
 	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,
 	ALC294_FIXUP_ASUS_INTSPK_GPIO,
+	ALC289_FIXUP_DELL_SPK2,
+	ALC289_FIXUP_DUAL_SPK,
 };
 
 static const struct hda_fixup alc269_fixups[] = {

@@ -7009,6 +7011,21 @@ static const struct hda_fixup alc269_fixups[] = {
 		.chained = true,
 		.chain_id = ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC
 	},
+	[ALC289_FIXUP_DELL_SPK2] = {
+		.type = HDA_FIXUP_PINS,
+		.v.pins = (const struct hda_pintbl[]) {
+			{ 0x17, 0x90170130 }, /* bass spk */
+			{ }
+		},
+		.chained = true,
+		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE
+	},
+	[ALC289_FIXUP_DUAL_SPK] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc285_fixup_speaker2_to_dac1,
+		.chained = true,
+		.chain_id = ALC289_FIXUP_DELL_SPK2
+	},
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {

@@ -7081,6 +7098,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
+	SND_PCI_QUIRK(0x1028, 0x097e, "Dell Precision", ALC289_FIXUP_DUAL_SPK),
+	SND_PCI_QUIRK(0x1028, 0x097d, "Dell Precision", ALC289_FIXUP_DUAL_SPK),
 	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),

Greg KH

author maintainer

2020-01-07 09:39 UTC #2 lore raw

Quoted 9 lines · Takashi Iwai

Quoted 6 lines · On Mon, 06 Jan 2020 13:10:30 +0100, <[email protected]> wrote:
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 4 lines

Hm, I could cherry-pick the commit e79c22695abd (also commit 48e01504cf53 at next) cleanly on linux-5.4.y branch.
Could you try again?

Ugh, my fault, seems Sasha already queued these patches up in the stable tree and I didn't notice them. When I tried to apply them they rightfully complained :(

sorry for the noise, all is good here.

greg k-h

Sasha Levin

maintainer

2020-01-07 18:59 UTC #3 lore raw

Quoted 13 lines · Greg KH

Quoted 12 lines · Takashi Iwai
Quoted 6 lines · On Mon, 06 Jan 2020 13:10:30 +0100, <[email protected]> wrote:
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Hm, I could cherry-pick the commit e79c22695abd (also commit 48e01504cf53 at next) cleanly on linux-5.4.y branch.

Quoted 7 lines

Quoted 1 line
Could you try again?
Ugh, my fault, seems Sasha already queued these patches up in the stable tree and I didn't notice them. When I tried to apply them they rightfully complained :(
sorry for the noise, all is good here.

Appologies for stepping on your toes here, I picked it up so that I could also take 48e01504cf53 ("ALSA: hda/realtek - Enable the bass speaker of ASUS UX431FLC") which fixes a different patch we took in the 5.4 tree.

Signature · 2 lines

Thanks,
Sasha