diff options
Diffstat (limited to 'sys-kernel/asahi-sources')
-rw-r--r-- | sys-kernel/asahi-sources/Manifest | 5 | ||||
-rw-r--r-- | sys-kernel/asahi-sources/asahi-sources-6.9.8_p1-r1.ebuild (renamed from sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild) | 1 | ||||
-rw-r--r-- | sys-kernel/asahi-sources/asahi-sources-6.9.9_p5-r1.ebuild (renamed from sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild) | 1 | ||||
-rw-r--r-- | sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch | 46 |
4 files changed, 2 insertions, 51 deletions
diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest index f9721c056080..09067dc8eb3b 100644 --- a/sys-kernel/asahi-sources/Manifest +++ b/sys-kernel/asahi-sources/Manifest @@ -1,5 +1,4 @@ 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 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 @@ -7,6 +6,6 @@ DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e36567 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 +EBUILD asahi-sources-6.9.8_p1-r1.ebuild 1667 BLAKE2B 468797017674ddc886c27de712417afc54086aaaf94044662124c54bdb1fd4ca8c1bb034d469a325c896b06bff46b1ee3ad68746758943e71fcf2369bfe7c4c9 SHA512 87844e895d3fde35316967274d2af5bad28386fb9547e4743f8450b7c814c2cb48d38c9cc21c11a5c2bad7375d601e9088b5ccbbc820ec10557ae3f43da7c0c2 +EBUILD asahi-sources-6.9.9_p5-r1.ebuild 1669 BLAKE2B d5115d0f2880d4fa1cf5beb3722818bf2fc03e79bcd41babc0cbd2e1b3469e8ed7bfdf09a1ea2f71be4cb4eda050cdbca91f2c590878dc810ec8eadc52d6ea03 SHA512 1b9a6ef084f144ecaa81626cef33452c1fe40b249da290a32e9921880182b34f7289e911ccfc96b35cd1b4ebde764669eafa028d2a498d304dd8fa03662c360a MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395 diff --git a/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1-r1.ebuild index ef7185794376..551f5fbce65e 100644 --- a/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild +++ b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1-r1.ebuild @@ -58,7 +58,6 @@ DEPEND=" 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_TAG}.patch " diff --git a/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5-r1.ebuild index 4b6fa5c16640..c7a931cddb78 100644 --- a/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild +++ b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5-r1.ebuild @@ -58,7 +58,6 @@ DEPEND=" 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_TAG}.patch " diff --git a/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch b/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch deleted file mode 100644 index fc6522e205b8..000000000000 --- a/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 46f153548760..d1b297f438f1 100644 ---- a/drivers/spi/spi.c -+++ b/drivers/spi/spi.c -@@ -1042,14 +1042,10 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) - if (spi->mode & SPI_CS_HIGH) - enable = !enable; - -- /* -- * Handle chip select delays for GPIO based CS or controllers without -- * programmable chip select timing. -- */ -- if ((spi_is_csgpiod(spi) || !spi->controller->set_cs_timing) && !activate) -- spi_delay_exec(&spi->cs_hold, NULL); -- - if (spi_is_csgpiod(spi)) { -+ if (!spi->controller->set_cs_timing && !activate) -+ spi_delay_exec(&spi->cs_hold, NULL); -+ - if (!(spi->mode & SPI_NO_CS)) { - /* - * Historically ACPI has no means of the GPIO polarity and -@@ -1083,16 +1079,16 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) - if ((spi->controller->flags & SPI_CONTROLLER_GPIO_SS) && - spi->controller->set_cs) - spi->controller->set_cs(spi, !enable); -+ -+ if (!spi->controller->set_cs_timing) { -+ if (activate) -+ spi_delay_exec(&spi->cs_setup, NULL); -+ else -+ spi_delay_exec(&spi->cs_inactive, NULL); -+ } - } else if (spi->controller->set_cs) { - spi->controller->set_cs(spi, !enable); - } -- -- if (spi_is_csgpiod(spi) || !spi->controller->set_cs_timing) { -- if (activate) -- spi_delay_exec(&spi->cs_setup, NULL); -- else -- spi_delay_exec(&spi->cs_inactive, NULL); -- } - } - - #ifdef CONFIG_HAS_DMA |