diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-12-11 13:31:14 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-12-11 13:31:14 +0100 |
| commit | 5f2377ac5502559ecfb7d70c2c99e5d553de1cd5 (patch) | |
| tree | 8502a36e8b01c7f251a5a2a9a3d98a923c886feb /include | |
| parent | b33e3e0f99946260200a43e783488416eeed112a (diff) | |
| parent | 41716009e150053a04c19bc2028ff7e1016a5fde (diff) | |
| download | barebox-5f2377ac5502559ecfb7d70c2c99e5d553de1cd5.tar.gz barebox-5f2377ac5502559ecfb7d70c2c99e5d553de1cd5.tar.xz | |
Merge branch 'for-next/mtd'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/mtd.h | 3 | ||||
| -rw-r--r-- | include/of.h | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index ee37dfd5cb..0d977fea25 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -206,6 +206,8 @@ struct mtd_info { int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs); int (*_block_markgood) (struct mtd_info *mtd, loff_t ofs); + int (*of_fixup)(struct mtd_info *mtd, struct device_node *root); + /* ECC status information */ struct mtd_ecc_stats ecc_stats; /* Subpage shift (NAND) */ @@ -248,7 +250,6 @@ struct mtd_info { struct list_head partitions_entry; char *partition_string; - char *of_path; unsigned int of_binding; }; diff --git a/include/of.h b/include/of.h index 6181da8c61..399fb7c5ba 100644 --- a/include/of.h +++ b/include/of.h @@ -277,6 +277,7 @@ extern struct device_d *of_device_enable_and_register_by_alias( struct cdev *of_parse_partition(struct cdev *cdev, struct device_node *node); int of_parse_partitions(struct cdev *cdev, struct device_node *node); +int of_fixup_partitions(struct device_node *np, struct cdev *cdev); int of_partitions_register_fixup(struct cdev *cdev); int of_device_is_stdout_path(struct device_d *dev); const char *of_get_model(void); @@ -305,6 +306,11 @@ static inline int of_parse_partitions(struct cdev *cdev, return -EINVAL; } +static inline int of_fixup_partitions(struct device_node *np, struct cdev *cdev) +{ + return -ENOSYS; +} + static inline int of_partitions_register_fixup(struct cdev *cdev) { return -ENOSYS; @@ -405,6 +411,17 @@ static inline struct device_node *of_get_child_by_name( return NULL; } +static inline char *of_get_reproducible_name(struct device_node *node) +{ + return NULL; +} + +static inline struct device_node * +of_find_node_by_reproducible_name(struct device_node *from, const char *name) +{ + return NULL; +} + static inline struct property *of_find_property(const struct device_node *np, const char *name, int *lenp) |