From 60bc3043590bf74ca1c9dd88a4e5f28a40d5b348 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 6 Dec 2012 10:26:05 +0100 Subject: [PATCH 100/123] MIPS: lantiq: honour model property inside devicetree during board init --- arch/mips/lantiq/prom.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index 9f9e875..fa12dc1 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c @@ -57,6 +57,21 @@ static void __init prom_init_cmdline(void) } } +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) { + pr_info("Board: %s\n", model); + snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN, "%s - %s", + soc_info.sys_type, model); + } + } + return 0; +} + void __init plat_mem_setup(void) { ioport_resource.start = IOPORT_RESOURCE_START; @@ -71,6 +86,8 @@ void __init plat_mem_setup(void) * parsed resulting in our memory appearing */ __dt_setup_arch(&__dtb_start); + + of_scan_flat_dt(early_init_dt_scan_model, NULL); } void __init device_tree_init(void) @@ -93,9 +110,8 @@ void __init prom_init(void) { /* call the soc specific detetcion code and get it to fill soc_info */ ltq_soc_detect(&soc_info); - snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN - 1, "%s rev %s", + snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN, "%s rev %s", soc_info.name, soc_info.rev_type); - soc_info.sys_type[LTQ_SYS_TYPE_LEN - 1] = '\0'; pr_info("SoC: %s\n", soc_info.sys_type); prom_init_cmdline(); -- 1.7.10.4