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 <miquel.raynal@bootlin.com>

diff --cc drivers/mtd/nand/raw/Kconfig
index 5dcb401,587f20c..0cd5ebf
--- 1/drivers/mtd/nand/raw/Kconfig
--- 2/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 drivers/mtd/nand/raw/omap2.c
Simple merge

diff --cc include/linux/platform_data/mtd-nand-omap2.h
index de6ada7,92f0118..8c2f1f1
--- 1/include/linux/platform_data/mtd-nand-omap2.h
--- 2/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 */