mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-08 21:42:04 +08:00
923677a74b
QCOM SPI NAND driver got merged upstream hence we can drop the special patch from qualcommax and qualcommbe target and move them to the generic backports directory to reduce patch maintenance. While at it refresh any affected patch and target and also backport other minor fixup for the SPI NAND driver merged upstream later. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From d32c4e58545f17caaa854415f854691e32d42075 Mon Sep 17 00:00:00 2001
|
|
From: Geert Uytterhoeven <geert+renesas@glider.be>
|
|
Date: Wed, 26 Mar 2025 15:22:19 +0100
|
|
Subject: [PATCH] spi: SPI_QPIC_SNAND should be tristate and depend on MTD
|
|
|
|
SPI_QPIC_SNAND is the only driver that selects MTD instead of depending
|
|
on it, which could lead to circular dependencies. Moreover, as
|
|
SPI_QPIC_SNAND is bool, this forces MTD (and various related symbols) to
|
|
be built-in, as can be seen in an allmodconfig kernel.
|
|
|
|
Except for a missing semicolon, there is no reason why SPI_QPIC_SNAND
|
|
cannot be tristate; all MODULE_*() boilerplate is already present.
|
|
Hence make SPI_QPIC_SNAND tristate, let it depend on MTD, and add the
|
|
missing semicolon.
|
|
|
|
Fixes: 7304d1909080ef0c ("spi: spi-qpic: add driver for QCOM SPI NAND flash Interface")
|
|
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
|
|
Link: https://patch.msgid.link/b63db431cbf35223a4400e44c296293d32c4543c.1742998909.git.geert+renesas@glider.be
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/Kconfig | 4 ++--
|
|
drivers/spi/spi-qpic-snand.c | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/spi/Kconfig
|
|
+++ b/drivers/spi/Kconfig
|
|
@@ -871,9 +871,9 @@ config SPI_QCOM_QSPI
|
|
QSPI(Quad SPI) driver for Qualcomm QSPI controller.
|
|
|
|
config SPI_QPIC_SNAND
|
|
- bool "QPIC SNAND controller"
|
|
+ tristate "QPIC SNAND controller"
|
|
depends on ARCH_QCOM || COMPILE_TEST
|
|
- select MTD
|
|
+ depends on MTD
|
|
help
|
|
QPIC_SNAND (QPIC SPI NAND) driver for Qualcomm QPIC controller.
|
|
QPIC controller supports both parallel nand and serial nand.
|
|
--- a/drivers/spi/spi-qpic-snand.c
|
|
+++ b/drivers/spi/spi-qpic-snand.c
|
|
@@ -1614,7 +1614,7 @@ static const struct of_device_id qcom_sn
|
|
.data = &ipq9574_snandc_props,
|
|
},
|
|
{}
|
|
-}
|
|
+};
|
|
MODULE_DEVICE_TABLE(of, qcom_snandc_of_match);
|
|
|
|
static struct platform_driver qcom_spi_driver = {
|