[openwrt/openwrt] kernel: test for kernel version greater 5.13 to fix mmc-spi

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 19 12:40:43 PDT 2022


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0ecb971a6f37052f851402b8ef837bb69c3874e6

commit 0ecb971a6f37052f851402b8ef837bb69c3874e6
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Mon Oct 10 08:04:41 2022 +0200

    kernel: test for kernel version greater 5.13 to fix mmc-spi
    
    The of_mmc_spi.o resource is provider agnostic in kernels greater 5.13
    and does not depend anymore on CONFIG_OF [0].
    
    [0] - https://github.com/torvalds/linux/commit/edd602146507532c1714d8428f654b87205f492e
    
    Suggested-by: John Thomson <git at johnthomson.fastmail.com.au>
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 package/kernel/linux/modules/spi.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/kernel/linux/modules/spi.mk b/package/kernel/linux/modules/spi.mk
index 01dc7dc7e6..5cdfc3b2b3 100644
--- a/package/kernel/linux/modules/spi.mk
+++ b/package/kernel/linux/modules/spi.mk
@@ -15,9 +15,10 @@ define KernelPackage/mmc-spi
           CONFIG_SPI=y \
           CONFIG_SPI_MASTER=y
   FILES:=\
-	$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/mmc/host/of_mmc_spi.ko) \
+	$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/mmc/host/of_mmc_spi.ko at lt5.13) \
+	$(LINUX_DIR)/drivers/mmc/host/of_mmc_spi.ko at ge5.13 \
 	$(LINUX_DIR)/drivers/mmc/host/mmc_spi.ko
-  AUTOLOAD:=$(call AutoProbe,$(if $(CONFIG_OF),of_mmc_spi) mmc_spi)
+  AUTOLOAD:=$(call AutoProbe,$(if $(CONFIG_OF),of_mmc_spi at lt5.13) of_mmc_spi at ge5.13 mmc_spi)
 endef
 
 define KernelPackage/mmc-spi/description




More information about the lede-commits mailing list