On Tue, Aug 30, 2022 at 10:06:13AM +0200, Johannes Zink wrote: > The i.MX7 GPMI NAND controller is completely backwards compatible with > the version of the IP on the i.MX6. There are additional features like > increased ECC strength, that we may want to use in future, but for now > treating it the same as an i.MX6 works without problems. > > Since the gpmi_nand driver requires the MXS_APBH_DMA driver, also switch it on. > > Signed-off-by: Johannes Zink <j.zink@xxxxxxxxxxxxxx> > --- > drivers/dma/Kconfig | 2 +- > drivers/mtd/nand/nand_mxs.c | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) Applied, thanks Sascha > > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig > index 4802bf522d..46b9b90d82 100644 > --- a/drivers/dma/Kconfig > +++ b/drivers/dma/Kconfig > @@ -3,7 +3,7 @@ menu "DMA support" > > config MXS_APBH_DMA > tristate "MXS APBH DMA ENGINE" > - depends on ARCH_IMX23 || ARCH_IMX28 || ARCH_IMX6 > + depends on ARCH_IMX23 || ARCH_IMX28 || ARCH_IMX6 || ARCH_IMX7 > select STMP_DEVICE > help > Experimental! > diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c > index 6f707f9b17..8991758e2b 100644 > --- a/drivers/mtd/nand/nand_mxs.c > +++ b/drivers/mtd/nand/nand_mxs.c > @@ -2271,6 +2271,9 @@ static __maybe_unused struct of_device_id gpmi_dt_ids[] = { > }, { > .compatible = "fsl,imx6q-gpmi-nand", > .data = (void *)GPMI_IMX6, > + }, { > + .compatible = "fsl,imx7d-gpmi-nand", > + .data = (void *)GPMI_IMX6, > }, { > /* sentinel */ > } > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |