linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: Use 'model' property to set machine_name from Device Tree
@ 2014-07-07  1:53 Chanwoo Choi
  2014-08-14  1:04 ` Chanwoo Choi
  2014-08-14 12:51 ` Catalin Marinas
  0 siblings, 2 replies; 4+ messages in thread
From: Chanwoo Choi @ 2014-07-07  1:53 UTC (permalink / raw)
  To: linux-arm-kernel

This patch use 'model' property from Device Tree to set machine_name.
The arm64 has already got the machine_name from Device Tree.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 arch/arm/kernel/setup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 8a16ee5..698616f 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -878,7 +878,11 @@ void __init setup_arch(char **cmdline_p)
 	if (!mdesc)
 		mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
 	machine_desc = mdesc;
+#if CONFIG_OF
+	machine_name = of_flat_dt_get_machine_name();
+#else
 	machine_name = mdesc->name;
+#endif
 
 	if (mdesc->reboot_mode != REBOOT_HARD)
 		reboot_mode = mdesc->reboot_mode;
-- 
1.8.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-08-14 12:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-07  1:53 [PATCH] ARM: Use 'model' property to set machine_name from Device Tree Chanwoo Choi
2014-08-14  1:04 ` Chanwoo Choi
2014-08-14  7:40   ` Russell King - ARM Linux
2014-08-14 12:51 ` Catalin Marinas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).