commit: 32e34f32409cfe76a974e6f53f48872e894ad83a Author: James Calligeros <jcalligeros99 <AT> gmail <DOT> com> AuthorDate: Thu Jul 18 02:53:40 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 18 08:04:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e34f32
sys-kernel/asahi-sources: drop stale SPI patch This patch to SPI breaks M1 series SoCs and should have been dropped with the 6.8 series. Signed-off-by: James Calligeros <jcalligeros99 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37599 Signed-off-by: Sam James <sam <AT> gentoo.org> ..._p1.ebuild => asahi-sources-6.9.8_p1-r1.ebuild} | 1 - ..._p5.ebuild => asahi-sources-6.9.9_p5-r1.ebuild} | 1 - .../asahi-6.8.2_revert_spi_stable_asahi.patch | 46 ---------------------- 3 files changed, 48 deletions(-) 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 similarity index 96% rename from sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild rename to 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 similarity index 96% rename from sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild rename to 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
