summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/embedded6xx/mvme5100.c
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2020-11-03 15:35:21 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2021-02-09 00:02:07 +1100
commitd20a864f434b277b245ac6508920d90a48f6155d (patch)
treeae8dabe413f54e8d847e96e1645f6f40789342d5 /arch/powerpc/platforms/embedded6xx/mvme5100.c
parent748770aeb44108ecb4e09d273e7718611cd60a98 (diff)
powerpc/embedded6xx/mve5100: 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-16-oohall@gmail.com
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/mvme5100.c')
-rw-r--r--arch/powerpc/platforms/embedded6xx/mvme5100.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c
index 1cd488daa0bf..c06a0490d157 100644
--- a/arch/powerpc/platforms/embedded6xx/mvme5100.c
+++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c
@@ -154,17 +154,19 @@ static const struct of_device_id mvme5100_of_bus_ids[] __initconst = {
*/
static void __init mvme5100_setup_arch(void)
{
- struct device_node *np;
-
if (ppc_md.progress)
ppc_md.progress("mvme5100_setup_arch()", 0);
- for_each_compatible_node(np, "pci", "hawk-pci")
- mvme5100_add_bridge(np);
-
restart = ioremap(BOARD_MODRST_REG, 4);
}
+static void __init mvme5100_setup_pci(void)
+{
+ struct device_node *np;
+
+ for_each_compatible_node(np, "pci", "hawk-pci")
+ mvme5100_add_bridge(np);
+}
static void mvme5100_show_cpuinfo(struct seq_file *m)
{
@@ -205,6 +207,7 @@ define_machine(mvme5100) {
.name = "MVME5100",
.probe = mvme5100_probe,
.setup_arch = mvme5100_setup_arch,
+ .discover_phbs = mvme5100_setup_pci,
.init_IRQ = mvme5100_pic_init,
.show_cpuinfo = mvme5100_show_cpuinfo,
.get_irq = mpic_get_irq,