ARM: Use 'model' property to set machine_name from Device Tree
authorChanwoo Choi <cw00.choi@samsung.com>
Thu, 14 Aug 2014 06:03:56 +0000 (15:03 +0900)
committerChanho Park <chanho61.park@samsung.com>
Tue, 18 Nov 2014 03:00:36 +0000 (12:00 +0900)
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 <cw00.choi@samsung.com>
arch/arm/kernel/setup.c

index eb83bcc..6620dae 100644 (file)
@@ -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);