summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2021-06-24 11:11:13 -0400
committerTom Rini <[email protected]>2021-06-24 11:11:13 -0400
commit67edf2553f15e5148efca213af3f41cef3410680 (patch)
treec362fd9dc9446add0e24fd4d843dee32af2f299a /include/linux
parent95eca8612b7ba790dfe5d72ce3269ef3a7cdae84 (diff)
parente41a2bc6b87397ef0aeda4132a8227d164cd592b (diff)
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-spi into next
- SPI NOT OF partitions (Marek BehĂșn) - Macronic SPI NAND (Jaime Liao) - Macronix MX66UW2G345G SPI NOR (zhengxun)
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/mtd.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 927854950a0..3b302fb8c31 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -581,6 +581,16 @@ static inline int del_mtd_partitions(struct mtd_info *mtd)
}
#endif
+#if defined(CONFIG_MTD_PARTITIONS) && CONFIG_IS_ENABLED(DM) && \
+ CONFIG_IS_ENABLED(OF_CONTROL)
+int add_mtd_partitions_of(struct mtd_info *master);
+#else
+static inline int add_mtd_partitions_of(struct mtd_info *master)
+{
+ return 0;
+}
+#endif
+
struct mtd_info *__mtd_next_device(int i);
#define mtd_for_each_device(mtd) \
for ((mtd) = __mtd_next_device(0); \