diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-05 15:04:00 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-21 18:59:22 +1000 |
| commit | 406b0b6ae3fcd5c7946a68a9e43b470c79d292a2 (patch) | |
| tree | 6d6ee917303ebae7cf3fd1b551778883e3941d3b /arch/powerpc/platforms/ps3/setup.c | |
| parent | 84b62c72faa197a5c9b75ee93527add31695fb32 (diff) | |
powerpc/64: Move 64-bit probe_machine() to later in the boot process
We no long need the machine type that early, so we can move probe_machine()
to after the device-tree has been expanded. This will allow further
consolidation.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms/ps3/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/ps3/setup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c index b7fdf88474e8..3a487e7f4a5e 100644 --- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c @@ -237,15 +237,13 @@ void __init ps3_early_mm_init(void) static int __init ps3_probe(void) { - unsigned long dt_root; - DBG(" -> %s:%d\n", __func__, __LINE__); - dt_root = of_get_flat_dt_root(); - if (!of_flat_dt_is_compatible(dt_root, "sony,ps3")) + if (!of_machine_is_compatible("sony,ps3")) return 0; ps3_os_area_save_params(); + pm_power_off = ps3_power_off; DBG(" <- %s:%d\n", __func__, __LINE__); |