From: Miquel Raynal Date: Fri, 31 Dec 2021 11:31:38 +0000 (+0100) Subject: Merge tag 'memory-controller-drv-omap-5.17' into nand/next X-Git-Tag: microblaze-v5.18~152^2^2 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=2997e4871621bc56d3c19b447355091dafb6e505;p=linux-2.6-microblaze.git Merge tag 'memory-controller-drv-omap-5.17' into nand/next Memory controller drivers for v5.17 - OMAP GPMC 1. Add support for AM64 SoC. 2. Minor improvement: use platform_get_irq(). [miquel.raynal@bootlin.com: A first commit introduced a new omap compatible and another moved the IDs to a header which created a conflict: moving the new ID as well in the header fixed it.] Signed-off-by: Miquel Raynal --- 2997e4871621bc56d3c19b447355091dafb6e505 diff --cc drivers/mtd/nand/raw/Kconfig index 5dcb401aca5a,587f20c6184f..0cd5ebf0d5d7 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@@ -40,8 -40,9 +40,9 @@@ config MTD_NAND_AMS_DELT config MTD_NAND_OMAP2 tristate "OMAP2, OMAP3, OMAP4 and Keystone NAND controller" - depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST + depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST depends on HAS_IOMEM + select OMAP_GPMC if ARCH_K3 help Support for NAND flash on Texas Instruments OMAP2, OMAP3, OMAP4 and Keystone platforms. diff --cc include/linux/platform_data/mtd-nand-omap2.h index de6ada739121,92f011805ad4..8c2f1f185353 --- a/include/linux/platform_data/mtd-nand-omap2.h +++ b/include/linux/platform_data/mtd-nand-omap2.h @@@ -61,4 -62,10 +62,11 @@@ struct gpmc_nand_regs void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER]; void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER]; }; - #endif + + static const struct of_device_id omap_nand_ids[] = { + { .compatible = "ti,omap2-nand", }, ++ { .compatible = "ti,am64-nand", }, + {}, + }; + + #endif /* _MTD_NAND_OMAP2_H */