summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2020-11-03 07:35:12 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2021-02-08 16:02:06 +0300
commitba5087622a0f11c8d3c6587392ebc70f96503e51 (patch)
tree0c1d2c1d01f51a7b0cfbd1f4c9f4d1d2ac9b590e
parente0bf9de2242a31a8f79015376ed08c4efe74774a (diff)
downloadlinux-ba5087622a0f11c8d3c6587392ebc70f96503e51.tar.xz
powerpc/52xx/media5200: Move PHB discovery
Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20201103043523.916109-7-oohall@gmail.com
-rw-r--r--arch/powerpc/platforms/52xx/media5200.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 07c5bc4ed0b5..efb8bdecbcc7 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -202,8 +202,6 @@ static void __init media5200_setup_arch(void)
/* Some mpc5200 & mpc5200b related configuration */
mpc5200_setup_xlb_arbiter();
- mpc52xx_setup_pci();
-
np = of_find_matching_node(NULL, mpc5200_gpio_ids);
gpio = of_iomap(np, 0);
of_node_put(np);
@@ -244,6 +242,7 @@ define_machine(media5200_platform) {
.name = "media5200-platform",
.probe = media5200_probe,
.setup_arch = media5200_setup_arch,
+ .discover_phbs = mpc52xx_setup_pci,
.init = mpc52xx_declare_of_platform_devices,
.init_IRQ = media5200_init_irq,
.get_irq = mpc52xx_get_irq,