Merge branch 'for-next/of-bootsource'

2 files changed, 8 insertions, 0 deletions

diff --git a/include/bootsource.h b/include/bootsource.h
index 064f6b9a28..29347aaeb0 100644
--- a/include/bootsource.h
+++ b/include/bootsource.h
@@ -25,5 +25,7 @@ enum bootsource bootsource_get(void);
 int bootsource_get_instance(void);
 void bootsource_set(enum bootsource src);
 void bootsource_set_instance(int instance);
+void bootsource_set_alias_name(const char *name);
+char *bootsource_get_alias_name(void);
 
 #endif	/* __BOOTSOURCE_H__ */
diff --git a/include/of.h b/include/of.h
index fec51bb94f..7fc4b7791f 100644
--- a/include/of.h
+++ b/include/of.h
@@ -94,6 +94,12 @@ static inline void of_write_number(void *__cell, u64 val, int size)
 	}
 }
 
+static inline const void *of_property_get_value(struct property *pp)
+{
+	return pp->value ? pp->value : pp->value_const;
+}
+
+
 void of_print_property(const void *data, int len);
 void of_print_cmdline(struct device_node *root);