aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/maple
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-07-03 03:22:05 -0400
committerPaul Mackerras <paulus@samba.org>2006-07-03 03:22:05 -0400
commit980a65136569b841cebaad524a34482b0b1627a9 (patch)
tree7207f26dfc1085b30a8bee9651da431490d59dd3 /arch/powerpc/platforms/maple
parentab13446616118dc61c00ea50cc49919400717dd0 (diff)
[POWERPC] Fix booting on Momentum "Apache" board (a Maple derivative)
This extends the maple device-tree workarounds to work on the Apache board as well, and extends the maple platform probing code to recognize the Apache board. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/maple')
-rw-r--r--arch/powerpc/platforms/maple/setup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 5cf90c28b141..611ca8e979e5 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -11,7 +11,7 @@
11 * 11 *
12 */ 12 */
13 13
14#define DEBUG 14#undef DEBUG
15 15
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/errno.h> 17#include <linux/errno.h>
@@ -256,7 +256,9 @@ static void __init maple_progress(char *s, unsigned short hex)
256static int __init maple_probe(void) 256static int __init maple_probe(void)
257{ 257{
258 unsigned long root = of_get_flat_dt_root(); 258 unsigned long root = of_get_flat_dt_root();
259 if (!of_flat_dt_is_compatible(root, "Momentum,Maple")) 259
260 if (!of_flat_dt_is_compatible(root, "Momentum,Maple") &&
261 !of_flat_dt_is_compatible(root, "Momentum,Apache"))
260 return 0; 262 return 0;
261 /* 263 /*
262 * On U3, the DART (iommu) must be allocated now since it 264 * On U3, the DART (iommu) must be allocated now since it