Merge branch 'for-next/of'

Conflicts:
	drivers/of/base.c
	include/of.h

2 files changed, 10 insertions, 1 deletions

diff --git a/include/memory.h b/include/memory.h
index 4be4340b14..165d2dc52a 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -18,7 +18,7 @@ struct memory_bank {
 
 extern struct list_head memory_banks;
 
-void barebox_add_memory_bank(const char *name, resource_size_t start,
+int barebox_add_memory_bank(const char *name, resource_size_t start,
 				    resource_size_t size);
 
 #define for_each_memory_bank(mem)	list_for_each_entry(mem, &memory_banks, list)
diff --git a/include/of.h b/include/of.h
index e6342b667c..58b4590085 100644
--- a/include/of.h
+++ b/include/of.h
@@ -108,6 +108,9 @@ void of_print_nodes(struct device_node *node, int indent);
 int of_probe(void);
 int of_parse_dtb(struct fdt_header *fdt);
 
+int of_property_read_string(struct device_node *np, const char *propname,
+				const char **out_string);
+
 #ifdef CONFIG_OFDEVICE
 int of_parse_partitions(const char *cdevname,
 			    struct device_node *node);
@@ -115,6 +118,7 @@ int of_parse_partitions(const char *cdevname,
 struct device_node *of_get_root_node(void);
 int of_alias_get_id(struct device_node *np, const char *stem);
 int of_device_is_stdout_path(struct device_d *dev);
+const char *of_get_model(void);
 #else
 static inline int of_parse_partitions(const char *cdevname,
 					  struct device_node *node)
@@ -136,6 +140,11 @@ static inline int of_device_is_stdout_path(struct device_d *dev)
 {
 	return 0;
 }
+
+static inline const char *of_get_model(void)
+{
+	return NULL;
+}
 #endif
 
 #endif /* __OF_H */