summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/embedded6xx/mvme5100.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt2016-07-05 07:04:05 +0200
committerMichael Ellerman2016-07-21 11:06:42 +0200
commit565713840445b7ccafb28dc1230d57d40bcb42a5 (patch)
tree012a5f6d943b583473f21b3390a0389a13dfea3b /arch/powerpc/platforms/embedded6xx/mvme5100.c
parentpowerpc/64: Move 64-bit probe_machine() to later in the boot process (diff)
downloadkernel-qcow2-linux-565713840445b7ccafb28dc1230d57d40bcb42a5.tar.gz
kernel-qcow2-linux-565713840445b7ccafb28dc1230d57d40bcb42a5.tar.xz
kernel-qcow2-linux-565713840445b7ccafb28dc1230d57d40bcb42a5.zip
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/embedded6xx/mvme5100.c')
-rw-r--r--arch/powerpc/platforms/embedded6xx/mvme5100.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c
index 1382e1f27518..ed7321d6772e 100644
--- a/arch/powerpc/platforms/embedded6xx/mvme5100.c
+++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c
@@ -194,9 +194,7 @@ static void __noreturn mvme5100_restart(char *cmd)
*/
static int __init mvme5100_probe(void)
{
- unsigned long root = of_get_flat_dt_root();
-
- return of_flat_dt_is_compatible(root, "MVME5100");
+ return of_machine_is_compatible("MVME5100");
}
static int __init probe_of_platform_devices(void)