diff options
| author | Chanwoo Choi <cw00.choi@samsung.com> | 2014-08-14 15:03:56 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:36 +0900 |
| commit | b0df73fb12d10a40ae35fb6f16ed0159ecb6ae87 (patch) | |
| tree | 589830471cb77e69eac0d162b2d407391ed9534d | |
| parent | e62ae33ded8107314c3120b8f5cf7da9ca57dcc9 (diff) | |
| download | linux-3.10-b0df73fb12d10a40ae35fb6f16ed0159ecb6ae87.tar.gz linux-3.10-b0df73fb12d10a40ae35fb6f16ed0159ecb6ae87.tar.bz2 linux-3.10-b0df73fb12d10a40ae35fb6f16ed0159ecb6ae87.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>
| -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); |