diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-08-28 10:56:40 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 21:03:57 -0400 |
commit | 97e7f455434704b4d42f918ac3de76f593e642c1 (patch) | |
tree | 05b894bd33af022f00a1cf5b569850dba02439f3 /arch/mips | |
parent | 986c494b3c05bac5eace21f8e3a42f2afbfcbd34 (diff) |
mips: use common of_flat_dt_get_machine_name
Convert mips to use the common of_flat_dt_get_machine_name function.
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>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/kernel/prom.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 0b2485f9a6c1..3c3b0df8f48d 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c | |||
@@ -47,24 +47,11 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) | |||
47 | return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); | 47 | return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); |
48 | } | 48 | } |
49 | 49 | ||
50 | int __init early_init_dt_scan_model(unsigned long node, const char *uname, | ||
51 | int depth, void *data) | ||
52 | { | ||
53 | if (!depth) { | ||
54 | char *model = of_get_flat_dt_prop(node, "model", NULL); | ||
55 | |||
56 | if (model) | ||
57 | mips_set_machine_name(model); | ||
58 | } | ||
59 | return 0; | ||
60 | } | ||
61 | |||
62 | void __init __dt_setup_arch(struct boot_param_header *bph) | 50 | void __init __dt_setup_arch(struct boot_param_header *bph) |
63 | { | 51 | { |
64 | if (!early_init_dt_scan(bph)) | 52 | if (!early_init_dt_scan(bph)) |
65 | return; | 53 | return; |
66 | 54 | ||
67 | /* try to load the mips machine name */ | 55 | mips_set_machine_name(of_flat_dt_get_machine_name()); |
68 | of_scan_flat_dt(early_init_dt_scan_model, NULL); | ||
69 | } | 56 | } |
70 | #endif | 57 | #endif |