[PATCH 11/14] ARM: shmobile: rcar-gen2: Remove useless copied section for LongTrail
Simon Horman
horms+renesas at verge.net.au
Wed Jun 25 00:35:23 PDT 2014
From: Geert Uytterhoeven <geert+renesas at glider.be>
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 at glider.be>
Acked-by: Magnus Damm <damm+renesas at opensource.se>
Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
---
arch/arm/mach-shmobile/setup-rcar-gen2.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 51d5723..73fb2a6 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,
u64 lpae_start = 1ULL << 32;
/* We are scanning "memory" nodes only */
- if (type == NULL) {
- /*
- * The longtrail doesn't have a device_type on the
- * /memory node, so look for the node called /memory at 0.
- */
- if (depth != 1 || strcmp(uname, "memory at 0") != 0)
- return 0;
- } else if (strcmp(type, "memory") != 0)
+ if (type == NULL || strcmp(type, "memory"))
return 0;
reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l);
--
2.0.0.rc2
More information about the linux-arm-kernel
mailing list