From b0df73fb12d10a40ae35fb6f16ed0159ecb6ae87 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 14 Aug 2014 15:03:56 +0900 Subject: [PATCH] ARM: Use 'model' property to set machine_name from Device Tree This patch use 'model' property from Device Tree to set machine_name. The arm64 has already got the machine_name from Device Tree. Change-Id: I5a810cf3446a48336d1dd4dfe11e56116c1d5bc1 Signed-off-by: Chanwoo Choi --- arch/arm/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index eb83bcc..6620dae 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -787,7 +787,7 @@ void __init setup_arch(char **cmdline_p) if (!mdesc) mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type); machine_desc = mdesc; - machine_name = mdesc->name; + machine_name = of_flat_dt_get_machine_name(); setup_dma_zone(mdesc); -- 2.7.4