diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-06-12 04:42:24 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 06:33:22 -0400 |
commit | ea2a0d581a3e742c2fb2bc520c8c8887fe1dafa6 (patch) | |
tree | 1a8600e8edd1303ed713cf1213f9229bf1aa276d | |
parent | b69f47c00f2eff19b532cf0142d81b993e587bf0 (diff) |
ARM: shmobile: rcar-gen2: Remove useless copied section for LongTrail
Open Firmware in the CHRP LongTrail does not support plugging in ARM CPUs
in its PPC 603e/604e-compatible CPU socket ;-)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/setup-rcar-gen2.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 51d572306e1a..73fb2a659d9f 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c | |||
@@ -129,14 +129,7 @@ static int __init rcar_gen2_scan_mem(unsigned long node, const char *uname, | |||
129 | u64 lpae_start = 1ULL << 32; | 129 | u64 lpae_start = 1ULL << 32; |
130 | 130 | ||
131 | /* We are scanning "memory" nodes only */ | 131 | /* We are scanning "memory" nodes only */ |
132 | if (type == NULL) { | 132 | if (type == NULL || strcmp(type, "memory")) |
133 | /* | ||
134 | * The longtrail doesn't have a device_type on the | ||
135 | * /memory node, so look for the node called /memory@0. | ||
136 | */ | ||
137 | if (depth != 1 || strcmp(uname, "memory@0") != 0) | ||
138 | return 0; | ||
139 | } else if (strcmp(type, "memory") != 0) | ||
140 | return 0; | 133 | return 0; |
141 | 134 | ||
142 | reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l); | 135 | reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l); |