aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-5.10
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-07-25 16:11:29 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-25 16:11:29 +0200
commit8c2509dc5ff72ca47bd0787da407f5adc051a2b9 (patch)
tree66bd416c32d986c7a8cb211cbfa2ce7768fe089a /target/linux/mediatek/patches-5.10
parente11be055f137c4a3eb0bcb113a8e36a1c619dbb3 (diff)
downloadupstream-8c2509dc5ff72ca47bd0787da407f5adc051a2b9.tar.gz
upstream-8c2509dc5ff72ca47bd0787da407f5adc051a2b9.tar.bz2
upstream-8c2509dc5ff72ca47bd0787da407f5adc051a2b9.zip
mediatek: Fix Fidelix-FM35X1GA patch
This patch did not apply cleanly any more after support for the XTX flash was added to the generic patches. Fixes: 92012dd8677a ("kernel: Add support for XTX XT26G02A SPI NAND") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mediatek/patches-5.10')
-rw-r--r--target/linux/mediatek/patches-5.10/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mediatek/patches-5.10/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch b/target/linux/mediatek/patches-5.10/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch
index 69a9297e1f..3af929e5f0 100644
--- a/target/linux/mediatek/patches-5.10/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch
+++ b/target/linux/mediatek/patches-5.10/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch
@@ -18,8 +18,8 @@ Signed-off-by: Davide Fioravanti <pantanastyle@gmail.com>
+++ b/drivers/mtd/nand/spi/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
--spinand-objs := core.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o
-+spinand-objs := core.o fidelix.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o
+-spinand-objs := core.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
++spinand-objs := core.o fidelix.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c