Commit 079d6348 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'mtd/mtk-spi-nand-for-5.19' into nand/next 



Mediatek ECC changes:
* Also parse the default nand-ecc-engine property if available
* Make mtk_ecc.c a separated module

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parents 9b2152f9 4c5bf4b5

drivers/mtd/nand/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,13 @@ config MTD_NAND_ECC_MXIC 
	help

	  This enables support for the hardware ECC engine from Macronix.



config MTD_NAND_ECC_MEDIATEK

	tristate "Mediatek hardware ECC engine"

	depends on HAS_IOMEM

	select MTD_NAND_ECC

	help

	  This enables support for the hardware ECC engine from Mediatek.



endmenu



endmenu

drivers/mtd/nand/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


nandcore-objs := core.o bbt.o

obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o

obj-$(CONFIG_MTD_NAND_ECC_MEDIATEK) += ecc-mtk.o



obj-y	+= onenand/

obj-y	+= raw/

drivers/mtd/nand/raw/mtk_ecc.c→drivers/mtd/nand/ecc-mtk.c

+5 −3
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/mutex.h>



#include "mtk_ecc.h"

#include <linux/mtd/nand-ecc-mtk.h>



#define ECC_IDLE_MASK		BIT(0)

#define ECC_IRQ_EN		BIT(0)
@@ -279,6 +278,9 @@ struct mtk_ecc *of_mtk_ecc_get(struct device_node *of_node) 
	struct mtk_ecc *ecc = NULL;

	struct device_node *np;



	np = of_parse_phandle(of_node, "nand-ecc-engine", 0);

	/* for backward compatibility */

	if (!np)

		np = of_parse_phandle(of_node, "ecc-engine", 0);

	if (np) {

		ecc = mtk_ecc_get(np);

drivers/mtd/nand/raw/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ config MTD_NAND_QCOM 


config MTD_NAND_MTK

	tristate "MTK NAND controller"

	depends on MTD_NAND_ECC_MEDIATEK

	depends on ARCH_MEDIATEK || COMPILE_TEST

	depends on HAS_IOMEM

	help

drivers/mtd/nand/raw/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ obj-$(CONFIG_MTD_NAND_SUNXI) += sunxi_nand.o 
obj-$(CONFIG_MTD_NAND_HISI504)	        += hisi504_nand.o

obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= brcmnand/

obj-$(CONFIG_MTD_NAND_QCOM)		+= qcom_nandc.o

obj-$(CONFIG_MTD_NAND_MTK)		+= mtk_ecc.o mtk_nand.o

obj-$(CONFIG_MTD_NAND_MTK)		+= mtk_nand.o

obj-$(CONFIG_MTD_NAND_MXIC)		+= mxic_nand.o

obj-$(CONFIG_MTD_NAND_TEGRA)		+= tegra_nand.o

obj-$(CONFIG_MTD_NAND_STM32_FMC2)	+= stm32_fmc2_nand.o