From: Greg Kroah-Hartman Date: Mon, 10 Dec 2018 11:39:16 +0000 (+0100) Subject: drop some broken 4.14 and 4.9 sound patches X-Git-Tag: v4.19.9~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc5854ded1f858d33330823552f06d20453d7eeb;p=thirdparty%2Fkernel%2Fstable-queue.git drop some broken 4.14 and 4.9 sound patches --- diff --git a/queue-4.14/alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch b/queue-4.14/alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch deleted file mode 100644 index 6b46c8e3e69..00000000000 --- a/queue-4.14/alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 705b65f107470499442240ff7afee5021a7002a6 Mon Sep 17 00:00:00 2001 -From: Chris Chiu -Date: Wed, 5 Dec 2018 14:48:54 +0800 -Subject: ALSA: hda/realtek - Add support for Acer Aspire C24-860 headset mic - -From: Chris Chiu - -commit 705b65f107470499442240ff7afee5021a7002a6 upstream. - -The Acer AIO Aspire C24-860 with ALC286 can't detect the headset -microphone. Just like another Acer AIO U27-880, it needs a different -pin value for 0x18 and the headset fixup to make headset mic work. - -Signed-off-by: Jian-Hong Pan -Signed-off-by: Daniel Drake -Signed-off-by: Chris Chiu -Cc: -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -6267,6 +6267,7 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572), - SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572), - SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), -+ SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK), - SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), - SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS), diff --git a/queue-4.14/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch b/queue-4.14/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch deleted file mode 100644 index 98b6fca4eeb..00000000000 --- a/queue-4.14/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9f8aefed9623a91dec54eab8908f3810b7f8d73a Mon Sep 17 00:00:00 2001 -From: Chris Chiu -Date: Wed, 5 Dec 2018 14:48:55 +0800 -Subject: ALSA: hda/realtek: Fix mic issue on Acer AIO Veriton Z4660G - -From: Chris Chiu - -commit 9f8aefed9623a91dec54eab8908f3810b7f8d73a upstream. - -Acer AIO Veriton Z4660G with ALC286 codec has issue with the input -from external microphones connecting via 'Front Mic' jack. The fixup -ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE enables the jack sensing of -the headset and fix the audio input issue of external microphone. - -Signed-off-by: Jian-Hong Pan -Signed-off-by: Daniel Drake -Signed-off-by: Chris Chiu -Cc: -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -6269,6 +6269,7 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), - SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK), -+ SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), - SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS), - SND_PCI_QUIRK(0x1028, 0x05bd, "Dell Latitude E6440", ALC292_FIXUP_DELL_E7X), diff --git a/queue-4.14/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch b/queue-4.14/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch deleted file mode 100644 index b7e0d43d3fa..00000000000 --- a/queue-4.14/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b72f936f6b325f4fde06b02e4b6ab682f6f2e73f Mon Sep 17 00:00:00 2001 -From: Chris Chiu -Date: Wed, 5 Dec 2018 14:48:56 +0800 -Subject: ALSA: hda/realtek: Fix mic issue on Acer AIO Veriton Z4860G/Z6860G - -From: Chris Chiu - -commit b72f936f6b325f4fde06b02e4b6ab682f6f2e73f upstream. - -Acer AIO Veriton Z4860G/Z6860G with the same ALC286 codec has issues -with the input from external microphone. The issue can be fixed by -the fixup ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE for Veriton Z4660G. - -Signed-off-by: Jian-Hong Pan -Signed-off-by: Daniel Drake -Signed-off-by: Chris Chiu -Cc: -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -6269,6 +6269,8 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), - SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK), -+ SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), -+ SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), - SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS), diff --git a/queue-4.14/series b/queue-4.14/series index b67524d8368..bd085140220 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -37,6 +37,3 @@ alsa-pcm-fix-starvation-on-down_write_nonblock.patch alsa-pcm-call-snd_pcm_unlink-conditionally-at-closing.patch alsa-pcm-fix-interval-evaluation-with-openmin-max.patch alsa-hda-realtek-fix-speaker-output-regression-on-thinkpad-t570.patch -alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch -alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch -alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch diff --git a/queue-4.9/alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch b/queue-4.9/alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch deleted file mode 100644 index 53c11841ce8..00000000000 --- a/queue-4.9/alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 705b65f107470499442240ff7afee5021a7002a6 Mon Sep 17 00:00:00 2001 -From: Chris Chiu -Date: Wed, 5 Dec 2018 14:48:54 +0800 -Subject: ALSA: hda/realtek - Add support for Acer Aspire C24-860 headset mic - -From: Chris Chiu - -commit 705b65f107470499442240ff7afee5021a7002a6 upstream. - -The Acer AIO Aspire C24-860 with ALC286 can't detect the headset -microphone. Just like another Acer AIO U27-880, it needs a different -pin value for 0x18 and the headset fixup to make headset mic work. - -Signed-off-by: Jian-Hong Pan -Signed-off-by: Daniel Drake -Signed-off-by: Chris Chiu -Cc: -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -5674,6 +5674,7 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572), - SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572), - SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), -+ SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK), - SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), - SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS), diff --git a/queue-4.9/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch b/queue-4.9/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch deleted file mode 100644 index 0d9346b26ce..00000000000 --- a/queue-4.9/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9f8aefed9623a91dec54eab8908f3810b7f8d73a Mon Sep 17 00:00:00 2001 -From: Chris Chiu -Date: Wed, 5 Dec 2018 14:48:55 +0800 -Subject: ALSA: hda/realtek: Fix mic issue on Acer AIO Veriton Z4660G - -From: Chris Chiu - -commit 9f8aefed9623a91dec54eab8908f3810b7f8d73a upstream. - -Acer AIO Veriton Z4660G with ALC286 codec has issue with the input -from external microphones connecting via 'Front Mic' jack. The fixup -ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE enables the jack sensing of -the headset and fix the audio input issue of external microphone. - -Signed-off-by: Jian-Hong Pan -Signed-off-by: Daniel Drake -Signed-off-by: Chris Chiu -Cc: -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -5676,6 +5676,7 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), - SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK), -+ SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), - SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS), - SND_PCI_QUIRK(0x1028, 0x05bd, "Dell Latitude E6440", ALC292_FIXUP_DELL_E7X), diff --git a/queue-4.9/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch b/queue-4.9/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch deleted file mode 100644 index 13da145df0c..00000000000 --- a/queue-4.9/alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b72f936f6b325f4fde06b02e4b6ab682f6f2e73f Mon Sep 17 00:00:00 2001 -From: Chris Chiu -Date: Wed, 5 Dec 2018 14:48:56 +0800 -Subject: ALSA: hda/realtek: Fix mic issue on Acer AIO Veriton Z4860G/Z6860G - -From: Chris Chiu - -commit b72f936f6b325f4fde06b02e4b6ab682f6f2e73f upstream. - -Acer AIO Veriton Z4860G/Z6860G with the same ALC286 codec has issues -with the input from external microphone. The issue can be fixed by -the fixup ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE for Veriton Z4660G. - -Signed-off-by: Jian-Hong Pan -Signed-off-by: Daniel Drake -Signed-off-by: Chris Chiu -Cc: -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_realtek.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -5676,6 +5676,8 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), - SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK), -+ SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), -+ SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), - SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS), diff --git a/queue-4.9/series b/queue-4.9/series index d9301c46f93..283baf6151d 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -27,6 +27,3 @@ alsa-pcm-fix-starvation-on-down_write_nonblock.patch alsa-pcm-call-snd_pcm_unlink-conditionally-at-closing.patch alsa-pcm-fix-interval-evaluation-with-openmin-max.patch alsa-hda-realtek-fix-speaker-output-regression-on-thinkpad-t570.patch -alsa-hda-realtek-add-support-for-acer-aspire-c24-860-headset-mic.patch -alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4660g.patch -alsa-hda-realtek-fix-mic-issue-on-acer-aio-veriton-z4860g-z6860g.patch