mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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
This commit is contained in:
parent
748770aeb4
commit
d20a864f43
2 changed files with 14 additions and 7 deletions
|
@ -154,17 +154,19 @@ static const struct of_device_id mvme5100_of_bus_ids[] __initconst = {
|
||||||
*/
|
*/
|
||||||
static void __init mvme5100_setup_arch(void)
|
static void __init mvme5100_setup_arch(void)
|
||||||
{
|
{
|
||||||
struct device_node *np;
|
|
||||||
|
|
||||||
if (ppc_md.progress)
|
if (ppc_md.progress)
|
||||||
ppc_md.progress("mvme5100_setup_arch()", 0);
|
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);
|
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)
|
static void mvme5100_show_cpuinfo(struct seq_file *m)
|
||||||
{
|
{
|
||||||
|
@ -205,6 +207,7 @@ define_machine(mvme5100) {
|
||||||
.name = "MVME5100",
|
.name = "MVME5100",
|
||||||
.probe = mvme5100_probe,
|
.probe = mvme5100_probe,
|
||||||
.setup_arch = mvme5100_setup_arch,
|
.setup_arch = mvme5100_setup_arch,
|
||||||
|
.discover_phbs = mvme5100_setup_pci,
|
||||||
.init_IRQ = mvme5100_pic_init,
|
.init_IRQ = mvme5100_pic_init,
|
||||||
.show_cpuinfo = mvme5100_show_cpuinfo,
|
.show_cpuinfo = mvme5100_show_cpuinfo,
|
||||||
.get_irq = mpic_get_irq,
|
.get_irq = mpic_get_irq,
|
||||||
|
|
|
@ -65,14 +65,17 @@ static int __init storcenter_add_bridge(struct device_node *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init storcenter_setup_arch(void)
|
static void __init storcenter_setup_arch(void)
|
||||||
|
{
|
||||||
|
printk(KERN_INFO "IOMEGA StorCenter\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void __init storcenter_setup_pci(void)
|
||||||
{
|
{
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
|
|
||||||
/* Lookup PCI host bridges */
|
/* Lookup PCI host bridges */
|
||||||
for_each_compatible_node(np, "pci", "mpc10x-pci")
|
for_each_compatible_node(np, "pci", "mpc10x-pci")
|
||||||
storcenter_add_bridge(np);
|
storcenter_add_bridge(np);
|
||||||
|
|
||||||
printk(KERN_INFO "IOMEGA StorCenter\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -117,6 +120,7 @@ define_machine(storcenter){
|
||||||
.name = "IOMEGA StorCenter",
|
.name = "IOMEGA StorCenter",
|
||||||
.probe = storcenter_probe,
|
.probe = storcenter_probe,
|
||||||
.setup_arch = storcenter_setup_arch,
|
.setup_arch = storcenter_setup_arch,
|
||||||
|
.discover_phbs = storcenter_setup_pci,
|
||||||
.init_IRQ = storcenter_init_IRQ,
|
.init_IRQ = storcenter_init_IRQ,
|
||||||
.get_irq = mpic_get_irq,
|
.get_irq = mpic_get_irq,
|
||||||
.restart = storcenter_restart,
|
.restart = storcenter_restart,
|
||||||
|
|
Loading…
Reference in a new issue