diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-19 15:01:53 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-19 15:01:53 +0000 |
| commit | ca3992bc0c12e381deb84cd47ec1181a6d34660d (patch) | |
| tree | 162006e862b9d856fdce1b19f0ba117dafb6ca58 /include/linux/of_fdt.h | |
| parent | 0829f6d1f69e4f2fae4062987ae6531a9af1a2e3 (diff) | |
| parent | 2040b52768ebab6e7bd73af0dc63703269c62f17 (diff) | |
Merge branch 'devicetree/next-reserved-mem' into devicetree/next
Diffstat (limited to 'include/linux/of_fdt.h')
| -rw-r--r-- | include/linux/of_fdt.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 2b77058a733..ddd7219af8a 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -98,7 +98,10 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, int depth, void *data); extern int early_init_dt_scan_memory(unsigned long node, const char *uname, int depth, void *data); +extern void early_init_fdt_scan_reserved_mem(void); extern void early_init_dt_add_memory_arch(u64 base, u64 size); +extern int early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, + bool no_map); extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align); extern u64 dt_mem_next_cell(int s, __be32 **cellp); @@ -118,6 +121,7 @@ extern void unflatten_and_copy_device_tree(void); extern void early_init_devtree(void *); extern void early_get_first_memblock_info(void *, phys_addr_t *); #else /* CONFIG_OF_FLATTREE */ +static inline void early_init_fdt_scan_reserved_mem(void) {} static inline const char *of_flat_dt_get_machine_name(void) { return NULL; } static inline void unflatten_device_tree(void) {} static inline void unflatten_and_copy_device_tree(void) {} |