diff options
| author | Rabin Vincent | 2015-02-08 16:14:06 +0100 |
|---|---|---|
| committer | Jesper Nilsson | 2015-03-25 09:49:48 +0100 |
| commit | a9f75ac5a24cb94c2373daa3d73f90d22cf5d94b (patch) | |
| tree | b445b1d3aae563e8465e639edf05b782ac50f1d9 /arch/cris/kernel/setup.c | |
| parent | CRISv32: add irq domains support (diff) | |
| download | kernel-qcow2-linux-a9f75ac5a24cb94c2373daa3d73f90d22cf5d94b.tar.gz kernel-qcow2-linux-a9f75ac5a24cb94c2373daa3d73f90d22cf5d94b.tar.xz kernel-qcow2-linux-a9f75ac5a24cb94c2373daa3d73f90d22cf5d94b.zip | |
CRISv32: add device tree support
Add support for booting CRISv32 with a built-in device tree.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/kernel/setup.c')
| -rw-r--r-- | arch/cris/kernel/setup.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c index 905b70ea9939..bb12aa93201d 100644 --- a/arch/cris/kernel/setup.c +++ b/arch/cris/kernel/setup.c @@ -19,6 +19,9 @@ #include <linux/utsname.h> #include <linux/pfn.h> #include <linux/cpu.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/of_platform.h> #include <asm/setup.h> #include <arch/system.h> @@ -64,6 +67,10 @@ void __init setup_arch(char **cmdline_p) unsigned long start_pfn, max_pfn; unsigned long memory_start; +#ifdef CONFIG_OF + early_init_dt_scan(__dtb_start); +#endif + /* register an initial console printing routine for printk's */ init_etrax_debug(); @@ -141,6 +148,8 @@ void __init setup_arch(char **cmdline_p) reserve_bootmem(PFN_PHYS(start_pfn), bootmap_size, BOOTMEM_DEFAULT); + unflatten_and_copy_device_tree(); + /* paging_init() sets up the MMU and marks all pages as reserved */ paging_init(); @@ -204,3 +213,9 @@ static int __init topology_init(void) subsys_initcall(topology_init); +static int __init cris_of_init(void) +{ + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + return 0; +} +core_initcall(cris_of_init); |