diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-05 01:04:05 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-21 05:06:42 -0400 |
commit | 565713840445b7ccafb28dc1230d57d40bcb42a5 (patch) | |
tree | 012a5f6d943b583473f21b3390a0389a13dfea3b /arch/powerpc/platforms/85xx/mpc85xx_ads.c | |
parent | 406b0b6ae3fcd5c7946a68a9e43b470c79d292a2 (diff) |
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/85xx/mpc85xx_ads.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ads.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index de72a5f464b1..8756715c7a47 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c | |||
@@ -160,9 +160,7 @@ machine_arch_initcall(mpc85xx_ads, mpc85xx_common_publish_devices); | |||
160 | */ | 160 | */ |
161 | static int __init mpc85xx_ads_probe(void) | 161 | static int __init mpc85xx_ads_probe(void) |
162 | { | 162 | { |
163 | unsigned long root = of_get_flat_dt_root(); | 163 | return of_machine_is_compatible("MPC85xxADS"); |
164 | |||
165 | return of_flat_dt_is_compatible(root, "MPC85xxADS"); | ||
166 | } | 164 | } |
167 | 165 | ||
168 | define_machine(mpc85xx_ads) { | 166 | define_machine(mpc85xx_ads) { |