lkml.org 
[lkml]   [2013]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 28/28] mips: use common of_flat_dt_get_machine_name
On 17/09/13 01:09, Rob Herring wrote:
> From: Rob Herring<rob.herring@calxeda.com>
>
> 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>


Thanks for this series ...



> arch/mips/kernel/prom.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
> index 0b2485f..3c3b0df 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)
> return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
> }
>
> -int __init early_init_dt_scan_model(unsigned long node, const char *uname,
> - int depth, void *data)
> -{
> - if (!depth) {
> - char *model = of_get_flat_dt_prop(node, "model", NULL);
> -
> - if (model)
> - mips_set_machine_name(model);
> - }
> - return 0;
> -}
> -
> void __init __dt_setup_arch(struct boot_param_header *bph)
> {
> if (!early_init_dt_scan(bph))
> return;
>
> - /* try to load the mips machine name */
> - of_scan_flat_dt(early_init_dt_scan_model, NULL);
> + mips_set_machine_name(of_flat_dt_get_machine_name());
> }
> #endif



\
 
 \ /
  Last update: 2013-09-17 06:41    [W:0.332 / U:0.316 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site