From: Oliver O'Halloran Date: Tue, 3 Nov 2020 04:35:10 +0000 (+1100) Subject: powerpc/52xx/efika: Move PHB discovery X-Git-Tag: v5.15~1680^2~126 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eab3166f4eac384b48ebd2ed7b61dc465c1912cf;p=platform%2Fkernel%2Flinux-starfive.git powerpc/52xx/efika: Move PHB discovery Signed-off-by: Oliver O'Halloran Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20201103043523.916109-5-oohall@gmail.com --- diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 4514a6f..3b7d70d 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c @@ -185,8 +185,6 @@ static void __init efika_setup_arch(void) /* Map important registers from the internal memory map */ mpc52xx_map_common_devices(); - efika_pcisetup(); - #ifdef CONFIG_PM mpc52xx_suspend.board_suspend_prepare = efika_suspend_prepare; mpc52xx_pm_init(); @@ -218,6 +216,7 @@ define_machine(efika) .name = EFIKA_PLATFORM_NAME, .probe = efika_probe, .setup_arch = efika_setup_arch, + .discover_phbs = efika_pcisetup, .init = mpc52xx_declare_of_platform_devices, .show_cpuinfo = efika_show_cpuinfo, .init_IRQ = mpc52xx_init_irq,