From: Chanwoo Choi <cw00.choi@samsung.com>
To: linux@arm.linux.org.uk
Cc: santosh.shilimkar@ti.com, will.deacon@arm.com,
catalin.marinas@arm.com, akpm@linux-foundation.org,
damm@opensource.se, ard.biesheuvel@linaro.org, olof@lixom.net,
kyungmin.park@samsung.com, sw0312.kim@samsung.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Chanwoo Choi <cw00.choi@samsung.com>
Subject: [PATCH] ARM: Use 'model' property to set machine_name from Device Tree
Date: Mon, 07 Jul 2014 10:53:11 +0900 [thread overview]
Message-ID: <1404697991-32191-1-git-send-email-cw00.choi@samsung.com> (raw)
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
next reply other threads:[~2014-07-07 1:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-07 1:53 Chanwoo Choi [this message]
2014-08-14 1:04 ` Chanwoo Choi
2014-08-14 7:40 ` Russell King - ARM Linux
2014-08-14 12:51 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404697991-32191-1-git-send-email-cw00.choi@samsung.com \
--to=cw00.choi@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=damm@opensource.se \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=santosh.shilimkar@ti.com \
--cc=sw0312.kim@samsung.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®