summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/44x/warp.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-07-05 15:04:05 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2016-07-21 19:06:42 +1000
commit565713840445b7ccafb28dc1230d57d40bcb42a5 (patch)
tree012a5f6d943b583473f21b3390a0389a13dfea3b /arch/powerpc/platforms/44x/warp.c
parent406b0b6ae3fcd5c7946a68a9e43b470c79d292a2 (diff)
downloadop-kernel-dev-565713840445b7ccafb28dc1230d57d40bcb42a5.zip
op-kernel-dev-565713840445b7ccafb28dc1230d57d40bcb42a5.tar.gz
powerpc: Move 32-bit probe() machine to later in the boot process
This converts all the 32-bit platforms to use the expanded device-tree which is a pretty mechanical change. Unlike 64-bit, the 32-bit kernel didn't rely on platform initializations to setup the MMU since it sets it up entirely before probe_machine() so the move has comparatively less consequences though it's a bigger patch. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms/44x/warp.c')
-rw-r--r--arch/powerpc/platforms/44x/warp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 501333c..5ecce54 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -44,9 +44,7 @@ machine_device_initcall(warp, warp_device_probe);
static int __init warp_probe(void)
{
- unsigned long root = of_get_flat_dt_root();
-
- if (!of_flat_dt_is_compatible(root, "pika,warp"))
+ if (!of_machine_is_compatible("pika,warp"))
return 0;
/* For __dma_alloc_coherent */
OpenPOWER on IntegriCloud