[PATCH] ARM: /proc/cpuinfo: Use DT machine name when possible
Pali Rohár
pali.rohar at gmail.com
Wed Jun 18 09:54:24 PDT 2014
Machine name from board description is some generic name on DT kernel.
DT provides machine name property which is specific for board, so use
it instead generic one when possible.
Signed-off-by: Pali Rohár <pali.rohar at gmail.com>
---
arch/arm/kernel/setup.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 8a16ee5..fbc7b4f 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -875,10 +875,13 @@ void __init setup_arch(char **cmdline_p)
setup_processor();
mdesc = setup_machine_fdt(__atags_pointer);
- if (!mdesc)
+ if (mdesc)
+ machine_name = of_flat_dt_get_machine_name();
+ else
mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
machine_desc = mdesc;
- machine_name = mdesc->name;
+ if (!machine_name)
+ machine_name = mdesc->name;
if (mdesc->reboot_mode != REBOOT_HARD)
reboot_mode = mdesc->reboot_mode;
--
1.7.9.5
More information about the linux-arm-kernel
mailing list