diff options
| author | Benjamin Herrenschmidt | 2016-07-05 07:04:05 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-07-21 11:06:42 +0200 |
| commit | 565713840445b7ccafb28dc1230d57d40bcb42a5 (patch) | |
| tree | 012a5f6d943b583473f21b3390a0389a13dfea3b /arch/powerpc/platforms/embedded6xx/wii.c | |
| parent | powerpc/64: Move 64-bit probe_machine() to later in the boot process (diff) | |
| download | kernel-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/wii.c')
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/wii.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c index ebaecb88df26..fe3e769db263 100644 --- a/arch/powerpc/platforms/embedded6xx/wii.c +++ b/arch/powerpc/platforms/embedded6xx/wii.c @@ -205,10 +205,7 @@ static void __init wii_pic_probe(void) static int __init wii_probe(void) { - unsigned long dt_root; - - dt_root = of_get_flat_dt_root(); - if (!of_flat_dt_is_compatible(dt_root, "nintendo,wii")) + if (!of_machine_is_compatible("nintendo,wii")) return 0; pm_power_off = wii_power_off; |