diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-08-26 10:18:20 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 11:38:12 -0500 |
| commit | a8e44636c66d90d177fcdf8e8cfc36747074a4ed (patch) | |
| tree | cb1443d79770d297d33be36a49d50236b213d445 /arch/c6x | |
| parent | d5189cc57b1d231b6dc745de6b68881901d0c5c4 (diff) | |
| download | blackbird-op-linux-a8e44636c66d90d177fcdf8e8cfc36747074a4ed.tar.gz blackbird-op-linux-a8e44636c66d90d177fcdf8e8cfc36747074a4ed.zip | |
c6x: use early_init_dt_scan
Convert c6x to use new early_init_dt_scan function.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: linux-c6x-dev@linux-c6x.org
Diffstat (limited to 'arch/c6x')
| -rw-r--r-- | arch/c6x/kernel/devicetree.c | 19 | ||||
| -rw-r--r-- | arch/c6x/kernel/setup.c | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/c6x/kernel/devicetree.c b/arch/c6x/kernel/devicetree.c index 5e8c838c1dde..d28a92fc0c52 100644 --- a/arch/c6x/kernel/devicetree.c +++ b/arch/c6x/kernel/devicetree.c @@ -10,28 +10,9 @@ * */ #include <linux/init.h> -#include <linux/of.h> -#include <linux/of_fdt.h> #include <linux/initrd.h> #include <linux/memblock.h> -void __init early_init_devtree(void *params) -{ - /* Setup flat device-tree pointer */ - initial_boot_params = params; - - /* Retrieve various informations from the /chosen node of the - * device-tree, including the platform type, initrd location and - * size and more ... - */ - of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line); - - /* Scan memory nodes and rebuild MEMBLOCKs */ - of_scan_flat_dt(early_init_dt_scan_root, NULL); - of_scan_flat_dt(early_init_dt_scan_memory, NULL); -} - - #ifdef CONFIG_BLK_DEV_INITRD void __init early_init_dt_setup_initrd_arch(u64 start, u64 end) { diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c index 0e5a812907d9..731db4b9014d 100644 --- a/arch/c6x/kernel/setup.c +++ b/arch/c6x/kernel/setup.c @@ -287,7 +287,7 @@ notrace void __init machine_init(unsigned long dt_ptr) fdt = dtb; /* Do some early initialization based on the flat device tree */ - early_init_devtree(fdt); + early_init_dt_scan(fdt); parse_early_param(); } |
