diff options
| author | Chanwoo Choi <cw00.choi@samsung.com> | 2014-08-14 15:03:56 +0900 |
|---|---|---|
| committer | Beomho Seo <beomho.seo@samsung.com> | 2014-08-14 17:41:28 +0900 |
| commit | dc8601daa26447a1e6b833da7d138e4d5ada9457 (patch) | |
| tree | 5555c6808cd56eea9c920c17944c709616786685 /arch | |
| parent | 6cb6b0f6a56b9fd8184a549bd1ebd2ce05149c8b (diff) | |
| download | linux-3.10-dc8601daa26447a1e6b833da7d138e4d5ada9457.tar.gz linux-3.10-dc8601daa26447a1e6b833da7d138e4d5ada9457.tar.bz2 linux-3.10-dc8601daa26447a1e6b833da7d138e4d5ada9457.zip | |
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 <cw00.choi@samsung.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index eb83bcc70ec..6620dae0002 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); |