gentoo auto-resync : 16:07:2024 - 12:27:58

6 files changed, 16 insertions, 227 deletions

diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest
index 0adc553f93f7..f9721c056080 100644
--- a/sys-kernel/asahi-sources/Manifest
+++ b/sys-kernel/asahi-sources/Manifest
@@ -1,14 +1,12 @@
 AUX asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch 1826 BLAKE2B 4e170e302c1d52b3f5b8d4f6e79eb096fe859745042d5539745df97a8e78cdca50fad24204cd5667620a3c65f93406dcf54c3eb51a3f45d9cd10369ca83cfe12 SHA512 afd78d1b42eae94472ba45cb259db811d6258af6b46e4f9cd64e30fd3c47728063c815199431f6c700c45f8a5d91fbfbf6e2c07a5f38dae7371cc8a2edae6ecf
 AUX asahi-6.8.2_revert_spi_stable_asahi.patch 1451 BLAKE2B 749163f2c8d1d6f7b667f5123afdb99106e9341375767cb652039d48415f101542abc6150b8f559a1b594209d1d29eaa158a3f9c1e0a450e1dff620a0c5e7e4a SHA512 7145725dccdeeeb304e97070f1dbec450165296919101e111ae1e188fd6d7c55cc68fbddcdf50d2bfe0e052f4aeb401a9cace8c59636afb4940405725a7ea327
-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 genpatches-6.8-12.base.tar.xz 687664 BLAKE2B 3c27ee511c258f3659d7f8cd5b6d470ffa10a2fc95bd536b272e0bb20c368dfc8c512f23fdc025e85ad90d6f628a58c80d8d15ec0ef8898caf7461162cf2dec2 SHA512 cd845b49341366190834b9782c9ffa270608a35e616ff483b40094913f6d01809421b80a7830117b606e57e6bb0ed9b0ed6dc14220826364fc9d2ee6a5916ad6
-DIST genpatches-6.8-12.extras.tar.xz 3736 BLAKE2B 15a15ca3097dc42ac5855e59fe61c961854c1afa8adc719c761ac58bb7c869d3240c228b0963a91927a9bc0af6998b4c40e4d286faf7d2defc2f21029d11c114 SHA512 4f1c8c07e81c0d1ed110bd4512d2a16c3e202c47d8ab6bedf5213cf6c2f8675e9b543e52dbce50fbbf550d88252e2c1c19c2465ddd7907f11a2979fa92466a7c
-DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
-DIST linux-asahi-6.8.9-3.tar.gz 235275610 BLAKE2B 8ee3ff2572a02851d66239c65187312a0f67aa492d9c3b3a734e291b250acbf9450960c745687ff98a339e4cc14a2eab7675c08d39f88de0c0aa7c320d20bdc8 SHA512 ebd854b357a1d0a7663129f48956da559bc23a4347836dd0c3a3eb8cd47013ed86d83711dc2b7a221c28f51bd0c42c0b1ea2302ef45ee4a2ddfbfacf33e6efc2
-DIST linux-asahi-6.8.9-6..asahi-6.8.9-7.patch 6483 BLAKE2B 7a50c83ce70f50f7ac27ca55406edae8941d271d89270eeb3c97fe446f14fb8fd07ef4f9aa3288af24ab8958aff0d250a6762edd87b7453592147216cb65e2f9 SHA512 7d26833d6ca717c48caec655fd78107367c67112b04181be781fb5746d8a00d7927198d67cdd22a4e57b131b0738125087972cd0ba7b0e7e16f04bb3d3301378
-DIST linux-asahi-6.8.9-6.patch 5163031 BLAKE2B de6411c7f6bb95fec4162648c89d6bf6be5e863d4647877c4cbbb9e4c8540b12b1dacd42c26a1d3561a36fe6c79650caf5e0481338764a10101cec53921043c7 SHA512 0cc24bf50c16cb6fc59bf9bd025babcdca081bc789da5791d0fd914c65d31342cc632998fe4a667296ee3ed067b311dc105e994e2a77d569bac3a8ed48fb5ecc
-EBUILD asahi-sources-6.8.9_p3.ebuild 2006 BLAKE2B d2d171d67b32a49b2d7f5ece2d401b2db5313234f4627d9a48472966beddc5e68864ab3a3dfe432248e0fcc3246c0ccd755ced7a9c417e989d95fce52973e842 SHA512 2953fa7747bc02df18301ebd5f159b4e49da25a7d2efa70029d3b4c00ed062ba8fd4632c29b976e482823c9b4f91d9c2320231330a5eba8adc04d5cc043da1b6
-EBUILD asahi-sources-6.8.9_p6.ebuild 1857 BLAKE2B b82b3d2159cc22bcf8758d690166b0059d6b3ceaec5fdf55c3f0b6a3111b00ca24e07452645585bc01e844e28baa81adea1b44b7223136346c6d0166ef7ca0f3 SHA512 af2256bd0b6e8dd24e8ac18de6f1f0d9c8240f1499caa80968f4a3fe45cb68ed3b82dc0b2996a5cf5f165c9e76d4cafa4e7b358d3c9679b3a9f8a218f45ce0c5
-EBUILD asahi-sources-6.8.9_p7.ebuild 2096 BLAKE2B dae5f47b023ec53259b1f93ca1b38f3f936177128b9a02655b8f5c1c994c3a14cab699477207a8286e74f784204649d2f5f2a555e2d682fa7c4466096173002a SHA512 92209bc607792dc4b72328f133a7d623229f6fd2c5fd72dc4165f7fbbe1f3328818860cf2a4f07dddc806bd02c8971c7f04033b43383fc2b49fd70aad8310bc2
+DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
+DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
+DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e
+DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e365672dbd1c0b3568d48bf949b660ff1abb483b28846eb36a162ddd9bd91473c25462440fd41a7ba3bac70467ad45fa88fdd29 SHA512 955cd846bb020d08888aac04ebc5c1e56429e11ac59601a3e068971ad05aee59b75a24722dc7fe2645ef4414424d21e117e2eeb24ae72a5949476a213f3383fa
+DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
+DIST linux-asahi-6.9.8-1.patch 5296308 BLAKE2B 7a6640235488d11ebaa230d022fc89d85633830a9082d5fc7a62ed7a46272a62dcf3b5f68387bc2c2cbe14a5fc9167d31a896ddbeefe1d8d70557077d83d90df SHA512 0c0de341a98fa91da4670c14a704d5cc0aaaf80ad74af86b9df2a13762a0f9196f0c32b32fc80cffce4f65c459d92a9363bee7c2c5f02e35d5ecd0ee0118b5d4
+DIST linux-asahi-6.9.9-5.patch 5356022 BLAKE2B c3b5fa8be8320d391f11e7f02b7aa4c67055484539da5a241e3557d075db6c60daea15abcb992dd04cc2dcd7b8fd67bf2a17b21225737a492f0b70a987403189 SHA512 49bb4812e467b0ef07a71b0f6c1a16b8ee627be9c9c0862b87b419080712d77f0a8b5a83ddb54b92776defc79afa8241749cec97e262d98c29da874801decaa3
+EBUILD asahi-sources-6.9.8_p1.ebuild 1722 BLAKE2B dfa32aef22b6995527c63423e2941e114482cf82f66234eaf6a41190f3ffb1f4a3ae33b8fe164215feec8d699e8f0ac988cebc98f3d6ab42375b71185a294bcf SHA512 b48cbbf09c2c059632aaf4ecd9cb260b279577e023ecca6fbe291ded7da2ea42d12dbc0c58cc9e1878148286fe2dc48a1bd03da91263f6efb82c9eac87cff776
+EBUILD asahi-sources-6.9.9_p5.ebuild 1724 BLAKE2B 4e3b0ade0f7a3ffd6429f40d1263500f85c85d4120d4520eedcc90d2187e708fa029fc9cdc560ccf9fefe7889b495b648cdcb6d0595af2410b1009bae0ea0a62 SHA512 cceec565e1e986994131d10c472588aab742614c8e60c4875ab646df07407c4ba89e567f52de3bad7c9920af68369cad87a04c12c71eeda80eb9172a002ef244
 MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p3.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.8.9_p3.ebuild
deleted file mode 100644
index ac1ab4ff4d6f..000000000000
--- a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p3.ebuild
+++ /dev/null
@@ -1,76 +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)"
-	if [[ "$(ver_cut 3)" == "0" ]] ; then
-		MY_P="asahi-$(ver_cut 1-2)-${MY_TAG}"
-	else
-		MY_P="asahi-$(ver_cut 1-3)-${MY_TAG}"
-	fi
-fi
-
-DESCRIPTION="Asahi Linux kernel sources"
-HOMEPAGE="https://asahilinux.org"
-KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> linux-${MY_P}.tar.gz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-"
-
-KEYWORDS="arm64"
-IUSE="rust"
-
-DEPEND="
-	${DEPEND}
-	rust? (
-		|| (
-			>=dev-lang/rust-bin-1.76[rust-src,rustfmt]
-			>=dev-lang/rust-1.76[rust-src,rustfmt]
-		)
-		dev-util/bindgen
-	)
-"
-
-PATCHES=(
-		"${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch"
-		"${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch"
-)
-
-src_unpack() {
-	unpack linux-${MY_P}.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.8.9_p7.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild
index 2303feb47dc1..ef7185794376 100644
--- a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p7.ebuild
+++ b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild
@@ -7,7 +7,7 @@ ETYPE="sources"
 CKV="$(ver_cut 1-3)"
 K_SECURITY_UNSUPPORTED="1"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="12"
+K_GENPATCHES_VER="9"
 K_NODRYRUN="1"
 
 inherit kernel-2
@@ -30,21 +30,18 @@ fi
 
 EXTRAVERSION="-asahi-${MY_TAG}"
 
-PREV_ASAHI_TAG="asahi-${MY_BASE}-6"
 ASAHI_TAG="asahi-${MY_BASE}-${MY_TAG}"
 
 DESCRIPTION="Asahi Linux kernel sources"
 HOMEPAGE="https://asahilinux.org"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-	https://github.com/AsahiLinux/linux/compare/v${MY_BASE}...${PREV_ASAHI_TAG}.patch
-		-> linux-${PREV_ASAHI_TAG}.patch
-	https://github.com/AsahiLinux/linux/compare/${PREV_ASAHI_TAG}...${ASAHI_TAG}.patch
-		-> linux-${PREV_ASAHI_TAG}..${ASAHI_TAG}.patch
+	https://github.com/AsahiLinux/linux/compare/v${MY_BASE}...${ASAHI_TAG}.patch
+		-> linux-${ASAHI_TAG}.patch
 "
 KV_FULL="${PVR/_p/-asahi-}"
 S="${WORKDIR}/linux-${KV_FULL}"
 
-KEYWORDS="~arm64"
+KEYWORDS="arm64"
 IUSE="rust"
 
 DEPEND="
@@ -62,10 +59,7 @@ UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="
 	${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch
 	${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch
-	${DISTDIR}/linux-${PREV_ASAHI_TAG}.patch
-	${DISTDIR}/linux-${PREV_ASAHI_TAG}..${ASAHI_TAG}.patch
-	${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch
-	${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch
+	${DISTDIR}/linux-${ASAHI_TAG}.patch
 "
 
 src_prepare() {
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p6.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild
index a0aa5d1ee2e2..4b6fa5c16640 100644
--- a/sys-kernel/asahi-sources/asahi-sources-6.8.9_p6.ebuild
+++ b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild
@@ -7,7 +7,7 @@ ETYPE="sources"
 CKV="$(ver_cut 1-3)"
 K_SECURITY_UNSUPPORTED="1"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="12"
+K_GENPATCHES_VER="10"
 K_NODRYRUN="1"
 
 inherit kernel-2
@@ -59,9 +59,7 @@ UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="
 	${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch
 	${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch
-	${DISTDIR}/linux-asahi-6.8.9-6.patch
-	${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch
-	${FILESDIR}/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch
+	${DISTDIR}/linux-${ASAHI_TAG}.patch
 "
 
 src_prepare() {
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 <marcan@marcan.st>
-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 <marcan@marcan.st>
----
- 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 <marcan@marcan.st>
-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 <marcan@marcan.st>
----
- 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 = {