summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-07-05 05:04:01 (GMT)
committerMichael Ellerman <mpe@ellerman.id.au>2016-07-13 08:15:36 (GMT)
commit69a94d84c7efc7bc146b5a8d6f05f6ed6f2d4e8f (patch)
treea68155f57f542fe249c97eee044706fb4566215a
parentda6a97bf12d57e341029b3624ed112175ecff514 (diff)
downloadlinux-69a94d84c7efc7bc146b5a8d6f05f6ed6f2d4e8f.tar.xz
powerpc/cell: Don't use flat device-tree after boot
Some bit of SPU code was using the FDT rather than the expanded device-tree. Fix it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/platforms/cell/spu_manage.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index c3327f3..21b4bfb 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -535,8 +535,7 @@ static int __init init_affinity(void)
if (of_has_vicinity()) {
init_affinity_fw();
} else {
- long root = of_get_flat_dt_root();
- if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
+ if (of_machine_is_compatible("IBM,CPBW-1.0"))
init_affinity_qs20_harcoded();
else
printk("No affinity configuration found\n");