nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mips: use early_init_dt_scan

Browse source 
Convert mips to use new early_init_dt_scan function.

Remove early_init_dt_scan_memory_arch

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Acked-by: John Crispin <blogic@openwrt.org>
This commit is contained in:
Rob Herring 2013-08-26 10:20:26 -05:00
parent dc0b433526
commit f75813c012
2 changed files with 3 additions and 39 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
arch/mips/include/asm/prom.h
View file

@ -17,9 +17,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
extern int early_init_dt_scan_memory_arch(unsigned long node,
const char *uname, int depth, void *data);
extern void device_tree_init(void); extern void device_tree_init(void);
static inline unsigned long pci_address_to_pio(phys_addr_t address) static inline unsigned long pci_address_to_pio(phys_addr_t address)

39
arch/mips/kernel/prom.c
View file

@ -17,8 +17,6 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/prom.h> #include <asm/prom.h>
@ -40,13 +38,6 @@ char *mips_get_machine_name(void)
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
int __init early_init_dt_scan_memory_arch(unsigned long node,
const char *uname, int depth,
void *data)
{
return early_init_dt_scan_memory(node, uname, depth, data);
}
void __init early_init_dt_add_memory_arch(u64 base, u64 size) void __init early_init_dt_add_memory_arch(u64 base, u64 size)
{ {
return add_memory_region(base, size, BOOT_MEM_RAM); return add_memory_region(base, size, BOOT_MEM_RAM);
@ -78,36 +69,12 @@ int __init early_init_dt_scan_model(unsigned long node, const char *uname,
return 0; return 0;
} }
void __init early_init_devtree(void *params) void __init __dt_setup_arch(struct boot_param_header *bph)
{ {
/* Setup flat device-tree pointer */ if (!early_init_dt_scan(bph))
initial_boot_params = params; return;
/* 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, arcs_cmdline);
/* Scan memory nodes */
of_scan_flat_dt(early_init_dt_scan_root, NULL);
of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
/* try to load the mips machine name */ /* try to load the mips machine name */
of_scan_flat_dt(early_init_dt_scan_model, NULL); of_scan_flat_dt(early_init_dt_scan_model, NULL);
} }
void __init __dt_setup_arch(struct boot_param_header *bph)
{
if (be32_to_cpu(bph->magic) != OF_DT_HEADER) {
pr_err("DTB has bad magic, ignoring builtin OF DTB\n");
return;
}
initial_boot_params = bph;
early_init_devtree(initial_boot_params);
}
#endif #endif