summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac
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/powermac
parent406b0b6ae3fcd5c7946a68a9e43b470c79d292a2 (diff)
downloadlinux-565713840445b7ccafb28dc1230d57d40bcb42a5.tar.bz2
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/powermac')
-rw-r--r--arch/powerpc/platforms/powermac/setup.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 0872f9837cf5..60ca40ac3519 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -590,17 +590,9 @@ console_initcall(check_pmac_serial_console);
*/
static int __init pmac_probe(void)
{
-#ifdef CONFIG_PPC32
- unsigned long root = of_get_flat_dt_root();
-
- if (!of_flat_dt_is_compatible(root, "Power Macintosh") &&
- !of_flat_dt_is_compatible(root, "MacRISC"))
- return 0;
-#else
if (!of_machine_is_compatible("Power Macintosh") &&
!of_machine_is_compatible("MacRISC"))
return 0;
-#endif
#ifdef CONFIG_PPC32
/* isa_io_base gets set in pmac_pci_init */