commit: 4247d150849357fea18a5eb80934362aad5fb9a4 Author: James Calligeros <jcalligeros99 <AT> gmail <DOT> com> AuthorDate: Sat Jul 13 01:31:30 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 15 23:32:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4247d150
sys-kernel/asahi-sources/files: drop speaker enablement patches Signed-off-by: James Calligeros <jcalligeros99 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37538 Signed-off-by: Sam James <sam <AT> gentoo.org> ...-sources-6.6.0_p16-enable-speakers-stage1.patch | 78 ---------------------- ...-sources-6.6.0_p16-enable-speakers-stage2.patch | 47 ------------- 2 files changed, 125 deletions(-) diff --git a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch deleted file mode 100644 index 1e5d9c74f1c1..000000000000 --- a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 385ea7b5023486aba7919cec8b6b3f6a843a1013 Mon Sep 17 00:00:00 2001 -From: Hector Martin <[email protected]> -Date: Fri, 15 Dec 2023 20:38:32 +0900 -Subject: [PATCH] READ COMMIT MESSAGE! macaudio: Enable first round of models - -Enables j313, j293, j493, j314, j414, j274, j375, j473, j474, j475 - -*** WARNING FOR DISTRO PACKAGERS WANTING TO APPLY THIS: *** -*** YOU ABSOLUTELY NEED THIS PATCH IN YOUR LSP-PLUGINS PACKAGE *** - -https://github.com/lsp-plugins/lsp-dsp-lib/pull/20 - -Do NOT enable speakers without that patch, on any model. It can/will -result in nasty noise that could damage them. - -Signed-off-by: Hector Martin <[email protected]> ---- - sound/soc/apple/macaudio.c | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/sound/soc/apple/macaudio.c b/sound/soc/apple/macaudio.c -index f5b349057a67e1..d2ced87e88c0e1 100644 ---- a/sound/soc/apple/macaudio.c -+++ b/sound/soc/apple/macaudio.c -@@ -1490,23 +1490,27 @@ struct macaudio_platform_cfg macaudio_j180_cfg = { - false, AMP_SN012776, SPKR_1W1T, false, 10, -20, - }; - struct macaudio_platform_cfg macaudio_j274_cfg = { -- false, AMP_TAS5770, SPKR_1W, false, 20, -20, -+ true, AMP_TAS5770, SPKR_1W, false, 20, -20, - }; - - struct macaudio_platform_cfg macaudio_j293_cfg = { -- false, AMP_TAS5770, SPKR_2W, true, 15, -20, -+ true, AMP_TAS5770, SPKR_2W, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j313_cfg = { -- false, AMP_TAS5770, SPKR_1W, true, 10, -20, -+ true, AMP_TAS5770, SPKR_1W, true, 10, -20, - }; - --struct macaudio_platform_cfg macaudio_j314_j316_cfg = { -+struct macaudio_platform_cfg macaudio_j314_cfg = { -+ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, -+}; -+ -+struct macaudio_platform_cfg macaudio_j316_cfg = { - false, AMP_SN012776, SPKR_2W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { -- false, AMP_SN012776, SPKR_1W, false, 20, -20, -+ true, AMP_SN012776, SPKR_1W, false, 20, -20, - }; - - struct macaudio_platform_cfg macaudio_j413_cfg = { -@@ -1522,7 +1526,7 @@ struct macaudio_platform_cfg macaudio_j45x_cfg = { - }; - - struct macaudio_platform_cfg macaudio_j493_cfg = { -- false, AMP_SN012776, SPKR_2W, true, 15, -20, -+ true, AMP_SN012776, SPKR_2W, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_fallback_cfg = { -@@ -1558,9 +1562,9 @@ static const struct of_device_id macaudio_snd_device_id[] = { - /* j313 AID4 tas5770 10 2× 1W */ - { .compatible = "apple,j313-macaudio", .data = &macaudio_j313_cfg }, - /* j314 AID8 sn012776 15 2× 2W+1T */ -- { .compatible = "apple,j314-macaudio", .data = &macaudio_j314_j316_cfg }, -+ { .compatible = "apple,j314-macaudio", .data = &macaudio_j314_cfg }, - /* j316 AID9 sn012776 15 2× 2W+1T */ -- { .compatible = "apple,j316-macaudio", .data = &macaudio_j314_j316_cfg }, -+ { .compatible = "apple,j316-macaudio", .data = &macaudio_j316_cfg }, - /* j375 AID10 sn012776 15 1× 1W */ - { .compatible = "apple,j375-macaudio", .data = &macaudio_j37x_j47x_cfg }, - /* j413 AID13 sn012776 15 2× 1W+1T */ diff --git a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch deleted file mode 100644 index 5a83346337fa..000000000000 --- a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6a24102c06c95951ab992e2d41336cc6d4bfdf23 Mon Sep 17 00:00:00 2001 -From: Hector Martin <[email protected]> -Date: Fri, 15 Dec 2023 20:40:53 +0900 -Subject: [PATCH] READ COMMIT MESSAGE! macaudio: Enable second round of models - -Enables j316, j413, j415, j416 - -*** WARNING FOR DISTRO PACKAGERS WANTING TO APPLY THIS: *** -*** YOU ABSOLUTELY NEED THIS PATCH IN YOUR LSP-PLUGINS PACKAGE *** - -https://github.com/lsp-plugins/lsp-dsp-lib/pull/20 - -Do NOT enable speakers without that patch, on any model. It can/will -result in nasty noise that could damage them. - -Signed-off-by: Hector Martin <[email protected]> ---- - sound/soc/apple/macaudio.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/apple/macaudio.c b/sound/soc/apple/macaudio.c -index d2ced87e88c0e1..f347f08b7ad01e 100644 ---- a/sound/soc/apple/macaudio.c -+++ b/sound/soc/apple/macaudio.c -@@ -1506,7 +1506,7 @@ struct macaudio_platform_cfg macaudio_j314_cfg = { - }; - - struct macaudio_platform_cfg macaudio_j316_cfg = { -- false, AMP_SN012776, SPKR_2W1T, true, 15, -20, -+ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { -@@ -1514,11 +1514,11 @@ struct macaudio_platform_cfg macaudio_j37x_j47x_cfg = { - }; - - struct macaudio_platform_cfg macaudio_j413_cfg = { -- false, AMP_SN012776, SPKR_1W1T, true, 15, -20, -+ true, AMP_SN012776, SPKR_1W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j415_cfg = { -- false, AMP_SN012776, SPKR_2W1T, true, 15, -20, -+ true, AMP_SN012776, SPKR_2W1T, true, 15, -20, - }; - - struct macaudio_platform_cfg macaudio_j45x_cfg = {
