aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Lindholm <[email protected]>2014-04-17 18:42:01 +0100
committerGrant Likely <[email protected]>2014-05-23 11:21:45 +0900
commitb44aa25d20e2ef6b824901cbc50a281791f3b421 (patch)
tree0e9bccb8e99978241b40045e7d7da1c5bbcd54cd
parentff5f762b44237deb83be7bf6db965eeafadfa3e1 (diff)
of: Handle memory@0 node on PPC32 only
In order to deal with an firmware bug on a specific ppc32 platform (longtrail), early_init_dt_scan_memory() looks for a node called memory@0 on all platforms. Restrict this quirk to ppc32 kernels only. Signed-off-by: Leif Lindholm <[email protected]> Cc: [email protected] Cc: Grant Likely <[email protected]> Cc: Mark Rutland <[email protected]> Cc: [email protected] Cc: [email protected]
-rw-r--r--drivers/of/fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index d429826b61a5..17be90f5445f 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -748,7 +748,7 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
* The longtrail doesn't have a device_type on the
* /memory node, so look for the node called /memory@0.
*/
- if (depth != 1 || strcmp(uname, "memory@0") != 0)
+ if (!IS_ENABLED(CONFIG_PPC32) || depth != 1 || strcmp(uname, "memory@0") != 0)
return 0;
} else if (strcmp(type, "memory") != 0)
return 0;