History

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.]

Miquel Raynal committed 4 years ago

Commit 2997e482 parents ecb78b2 dbcb1245 files · +66 −24Browse files

Showing the changes to include/linux/platform_data (1 of 5 files). Show all

Unified · Split

include/linux/platform_data/mtd-nand-omap2.h+9−1
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 #define _MTD_NAND_OMAP2_H
88
99 #include <linux/mtd/partitions.h>
10+#include <linux/mod_devicetable.h>
1011
1112 #define GPMC_BCH_NUM_REMAINDER 8
1213
@@ -61,4 +62,11 @@ struct gpmc_nand_regs { · 48 unmodified lines
6162 void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];
6263 void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];
6364 };
64−#endif
65+
66+static const struct of_device_id omap_nand_ids[] = {
67+ { .compatible = "ti,omap2-nand", },
68+ { .compatible = "ti,am64-nand", },
69+ {},
70+};
71+
72+#endif /* _MTD_NAND_OMAP2_H */