Commit d20a864f authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/embedded6xx/mve5100: Move PHB discovery 



Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201103043523.916109-16-oohall@gmail.com
parent 748770ae

arch/powerpc/platforms/embedded6xx/mvme5100.c

+8 −5
Original line number Diff line number Diff line
@@ -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,

arch/powerpc/platforms/embedded6xx/storcenter.c

+6 −2
Original line number Diff line number Diff line
@@ -65,14 +65,17 @@ static int __init storcenter_add_bridge(struct device_node *dev) 
}



static void __init storcenter_setup_arch(void)

{

	printk(KERN_INFO "IOMEGA StorCenter\n");

}



static void __init storcenter_setup_pci(void)

{

	struct device_node *np;



	/* Lookup PCI host bridges */

	for_each_compatible_node(np, "pci", "mpc10x-pci")

		storcenter_add_bridge(np);



	printk(KERN_INFO "IOMEGA StorCenter\n");

}



/*
@@ -117,6 +120,7 @@ define_machine(storcenter){ 
	.name 			= "IOMEGA StorCenter",

	.probe 			= storcenter_probe,

	.setup_arch 		= storcenter_setup_arch,

	.discover_phbs 		= storcenter_setup_pci,

	.init_IRQ 		= storcenter_init_IRQ,

	.get_irq 		= mpic_get_irq,

	.restart 		= storcenter_restart,