From 48e7f15d37baf7167041b2ab0e2a19a703e5c99f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Apr 2024 08:13:46 +0100 Subject: gentoo auto-resync : 01:04:2024 - 08:13:46 --- sys-kernel/Manifest.gz | Bin 4577 -> 4576 bytes sys-kernel/asahi-sources/Manifest | 9 +-- .../asahi-sources/asahi-sources-6.6.0_p15.ebuild | 69 ------------------ .../asahi-sources/asahi-sources-6.6.0_p16.ebuild | 72 +++++++++++++++++++ ...-sources-6.6.0_p15-enable-speakers-stage1.patch | 78 --------------------- ...-sources-6.6.0_p15-enable-speakers-stage2.patch | 47 ------------- ...-sources-6.6.0_p16-enable-speakers-stage1.patch | 78 +++++++++++++++++++++ ...-sources-6.6.0_p16-enable-speakers-stage2.patch | 47 +++++++++++++ 8 files changed, 202 insertions(+), 198 deletions(-) delete mode 100644 sys-kernel/asahi-sources/asahi-sources-6.6.0_p15.ebuild create mode 100644 sys-kernel/asahi-sources/asahi-sources-6.6.0_p16.ebuild delete mode 100644 sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage1.patch delete mode 100644 sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage2.patch create mode 100644 sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch create mode 100644 sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch (limited to 'sys-kernel') diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz index 1a51fefe4f8f..b312ecfd3e7a 100644 Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest index b7c96c61e9f4..4e0ef2078183 100644 --- a/sys-kernel/asahi-sources/Manifest +++ b/sys-kernel/asahi-sources/Manifest @@ -1,5 +1,6 @@ -AUX asahi-sources-6.6.0_p15-enable-speakers-stage1.patch 3053 BLAKE2B d93a2b91a526fe3db72b7308953ce3c0789d8fdb64d14cbb96efeb0923632be46350cd0e7c07163ce05ae52bc0b8825229cffd7c4b35afacb678c963dff9e050 SHA512 86d1c7f3392523039b2803fe5f4ee3b386e1284445d2072c747f1d4936a4cc5e1aa3b8b17b80ebb97b70bcf2b4bd6603df373a94fbc23ca3cc1f89c0b6ad6407 -AUX asahi-sources-6.6.0_p15-enable-speakers-stage2.patch 1609 BLAKE2B eb51b5aeca1f44589373c212aa6e8e3dd0f0c2ee5a7e78e9a6a48ad9ce3337b649a4727b801b583dc4c43857494a8c43caba061ee564c7358d3db308fde91231 SHA512 9da0942b20f0566ff4eb1e4da5ab670cce41293abaf266414ad3b93f4790ef52e8ad92830ddee26fbd1f0287238bf261d8a1edc471427b1581f5cce00880973e -DIST asahi-sources-6.6.0_p15.tar.gz 229858421 BLAKE2B f0cdce0421bb8637d52e82d2ff0b7e07c29e828783c7cb8733f1582916be81bfd14a0b6a98f51f633ee9da3d10aa1fff6b27c5779bd9fa55c1d04615173d6d4b SHA512 b261e3813f1c0f5bae3a24e7ed0dce41470cfe2ee965ab0121d41793aa08f72d0d91be633f7ba0317f265a6e98a7a134cf86a29e7d48dbb58c5f5f7a3a13cc53 -EBUILD asahi-sources-6.6.0_p15.ebuild 1844 BLAKE2B 68b95d85619d47129b0ada1cff829f751ad6c906c6abd4ef85be4505b61ce8afba32de9580cedabf8be968b3dec3c16974f76ddb224a534c59cacde0134d606c SHA512 0189027d307a5d062e9146112bb54e5d810ab9efc3c4e98abde2b9585edab59de7e094fd11ee5d560f0a2d41bb66205367822fda27d89a71430a6bdaaedf210c +AUX asahi-sources-6.6.0_p16-enable-speakers-stage1.patch 3053 BLAKE2B d93a2b91a526fe3db72b7308953ce3c0789d8fdb64d14cbb96efeb0923632be46350cd0e7c07163ce05ae52bc0b8825229cffd7c4b35afacb678c963dff9e050 SHA512 86d1c7f3392523039b2803fe5f4ee3b386e1284445d2072c747f1d4936a4cc5e1aa3b8b17b80ebb97b70bcf2b4bd6603df373a94fbc23ca3cc1f89c0b6ad6407 +AUX asahi-sources-6.6.0_p16-enable-speakers-stage2.patch 1609 BLAKE2B eb51b5aeca1f44589373c212aa6e8e3dd0f0c2ee5a7e78e9a6a48ad9ce3337b649a4727b801b583dc4c43857494a8c43caba061ee564c7358d3db308fde91231 SHA512 9da0942b20f0566ff4eb1e4da5ab670cce41293abaf266414ad3b93f4790ef52e8ad92830ddee26fbd1f0287238bf261d8a1edc471427b1581f5cce00880973e +DIST asahi-sources-6.6.0_p16-rust-alloc-fix.patch 52132 BLAKE2B 3ba12bf87decb581626739786b8c0b6686c8a1d2c964ac534e2701473b117d59b084c686ba8e09bb65f27fbe57574ec2ddf8e89b544f3bdaaebc7acd4f0d2d5f SHA512 d4d1edab5a67152326a4712493a783660f68c1353e058536d19ed7a7f7d288e77b9916fc07639edd1f13f8a1948028fad3b92a90c03152522159b7f79ab54aa1 +DIST asahi-sources-6.6.0_p16.tar.gz 229861406 BLAKE2B e8f90373fe3cfb0ee8824158c59d548af05d1e68626715a65dcf086b35cfe7f4d44b184f02bbfad33474040b86f488e4fa99c8886ae329cf138933161658f94c SHA512 fc62cf346b95229aa31bc1483c9fcffaeacf94d09d13801a3e8e50ed3ba7f3d1b1d4dd8083051879955e1f99bffa61bf411cd38fcc45e176d372fc1d205b9c76 +EBUILD asahi-sources-6.6.0_p16.ebuild 2086 BLAKE2B 74baeb491d3b1fa80365144ecbdbc2d5becac1dfe7d41355ba1f04e0aed202aa3a43627854db38f114100ac1ad6602e87d24582c641e319bf392bf1a36a4b020 SHA512 e0da9422f31e4a2a09191c58f559d3c7a86abd48ef75f3f132cc85ef712a61a3cbbf75c5c7742292d2fa19674b62fdde0e357d891c472f3fd08c3766bbde4694 MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395 diff --git a/sys-kernel/asahi-sources/asahi-sources-6.6.0_p15.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.6.0_p15.ebuild deleted file mode 100644 index f462385c5aac..000000000000 --- a/sys-kernel/asahi-sources/asahi-sources-6.6.0_p15.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -K_SECURITY_UNSUPPORTED="1" -ETYPE="sources" -#K_WANT_GENPATCHES="base extras experimental" -#K_GENPATCHES_VER="5" -K_NODRYRUN="1" - -inherit kernel-2 -detect_version -detect_arch - -if [[ ${PV} != ${PV/_rc} ]] ; then - # $PV is expected to be of following form: 6.0_rc5_p1 - MY_TAG="$(ver_cut 6)" - MY_P="asahi-$(ver_rs 2 - $(ver_cut 1-4))-${MY_TAG}" -else - # $PV is expected to be of following form: 5.19.0_p1 - MY_TAG="$(ver_cut 5)" - MY_P="asahi-$(ver_cut 1-2)-${MY_TAG}" -fi - -DESCRIPTION="Asahi Linux kernel sources" -HOMEPAGE="https://asahilinux.org" -KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> ${PN}-${PV}.tar.gz" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" - -KEYWORDS="~arm64" -IUSE="rust" - -DEPEND=" - ${DEPEND} - rust? ( || ( dev-lang/rust[rust-src] - dev-lang/rust-bin[rust-src] - ) - dev-util/bindgen - ) -" - -PATCHES=( - "${FILESDIR}/${P}-enable-speakers-stage1.patch" - "${FILESDIR}/${P}-enable-speakers-stage2.patch" -) - -src_unpack() { - unpack ${PN}-${PV}.tar.gz - mv linux-${MY_P} linux-${KV_FULL} || die "Could not move source tree" -} - -src_prepare() { - default - cd "${WORKDIR}/linux-${KV-FULL}" || die - # XXX: Genpatches do not yet work with Rust kernels - #handle_genpatches --set-unipatch-list - #[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_GENPATCHES} || -n ${UNIPATCH_LIST_DEFAULT} ]] && \ - # unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}" - #unpack_fix_install_path - #env_setup_xmakeopts - echo "-${MY_TAG}" > localversion.10-pkgrel || die - cd "${S}" || die -} - -pkg_postinst() { - einfo "For more information about Asahi Linux please visit ${HOMEPAGE}," - einfo "or consult the Wiki at https://github.com/AsahiLinux/docs/wiki." - kernel-2_pkg_postinst -} diff --git a/sys-kernel/asahi-sources/asahi-sources-6.6.0_p16.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.6.0_p16.ebuild new file mode 100644 index 000000000000..180c71935834 --- /dev/null +++ b/sys-kernel/asahi-sources/asahi-sources-6.6.0_p16.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +K_SECURITY_UNSUPPORTED="1" +ETYPE="sources" +#K_WANT_GENPATCHES="base extras experimental" +#K_GENPATCHES_VER="5" +K_NODRYRUN="1" + +inherit kernel-2 +detect_version +detect_arch + +if [[ ${PV} != ${PV/_rc} ]] ; then + # $PV is expected to be of following form: 6.0_rc5_p1 + MY_TAG="$(ver_cut 6)" + MY_P="asahi-$(ver_rs 2 - $(ver_cut 1-4))-${MY_TAG}" +else + # $PV is expected to be of following form: 5.19.0_p1 + MY_TAG="$(ver_cut 5)" + MY_P="asahi-$(ver_cut 1-2)-${MY_TAG}" +fi + +DESCRIPTION="Asahi Linux kernel sources" +HOMEPAGE="https://asahilinux.org" +KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> ${PN}-${PV}.tar.gz" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} + https://raw.githubusercontent.com/chadmed/asahi-overlay/main/sys-kernel/asahi-kernel/files/asahi-kernel-6.6.0_p16-rust-alloc-fix.patch -> ${P}-rust-alloc-fix.patch +" + +KEYWORDS="arm64" +IUSE="rust" + +DEPEND=" + ${DEPEND} + rust? ( || ( dev-lang/rust:stable/1.75[rust-src,rustfmt] + ~dev-lang/rust-bin-1.75.0[rust-src,rustfmt] + ) + dev-util/bindgen + ) +" + +PATCHES=( + "${FILESDIR}/${P}-enable-speakers-stage1.patch" + "${FILESDIR}/${P}-enable-speakers-stage2.patch" + "${DISTDIR}/${P}-rust-alloc-fix.patch" +) + +src_unpack() { + unpack ${PN}-${PV}.tar.gz + mv linux-${MY_P} linux-${KV_FULL} || die "Could not move source tree" +} + +src_prepare() { + default + cd "${WORKDIR}/linux-${KV-FULL}" || die + # XXX: Genpatches do not yet work with Rust kernels + #handle_genpatches --set-unipatch-list + #[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_GENPATCHES} || -n ${UNIPATCH_LIST_DEFAULT} ]] && \ + # unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}" + #unpack_fix_install_path + #env_setup_xmakeopts + echo "-${MY_TAG}" > localversion.10-pkgrel || die + cd "${S}" || die +} + +pkg_postinst() { + einfo "For more information about Asahi Linux please visit ${HOMEPAGE}," + einfo "or consult the Wiki at https://github.com/AsahiLinux/docs/wiki." + kernel-2_pkg_postinst +} diff --git a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage1.patch b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage1.patch deleted file mode 100644 index 1e5d9c74f1c1..000000000000 --- a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage1.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 385ea7b5023486aba7919cec8b6b3f6a843a1013 Mon Sep 17 00:00:00 2001 -From: Hector Martin -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 ---- - 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_p15-enable-speakers-stage2.patch b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage2.patch deleted file mode 100644 index 5a83346337fa..000000000000 --- a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage2.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6a24102c06c95951ab992e2d41336cc6d4bfdf23 Mon Sep 17 00:00:00 2001 -From: Hector Martin -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 ---- - 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 = { 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 new file mode 100644 index 000000000000..1e5d9c74f1c1 --- /dev/null +++ b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch @@ -0,0 +1,78 @@ +From 385ea7b5023486aba7919cec8b6b3f6a843a1013 Mon Sep 17 00:00:00 2001 +From: Hector Martin +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 +--- + 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 new file mode 100644 index 000000000000..5a83346337fa --- /dev/null +++ b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch @@ -0,0 +1,47 @@ +From 6a24102c06c95951ab992e2d41336cc6d4bfdf23 Mon Sep 17 00:00:00 2001 +From: Hector Martin +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 +--- + 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 = { -- cgit v1.2.3