From 8c2509dc5ff72ca47bd0787da407f5adc051a2b9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 25 Jul 2021 16:11:29 +0200 Subject: [PATCH] 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 --- ...340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch | 4 ++-- 1 file 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 69a9297e1f4a..3af929e5f0d4 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 +++ 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 -- 2.30.2