From: Oliver O'Halloran <oohall@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Subject: [PATCH 16/18] powerpc/embedded6xx/mve5100: Move PHB discovery
Date: Tue, 3 Nov 2020 15:35:21 +1100 [thread overview]
Message-ID: <20201103043523.916109-16-oohall@gmail.com> (raw)
In-Reply-To: <20201103043523.916109-1-oohall@gmail.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
compile tested with mvme5100_defconfig
---
arch/powerpc/platforms/embedded6xx/mvme5100.c | 13 ++++++++-----
arch/powerpc/platforms/embedded6xx/storcenter.c | 8 ++++++--
2 files changed, 14 insertions(+), 7 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,
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index e346ddcef45e..e188b90f7016 100644
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -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,
--
2.26.2
next prev parent reply other threads:[~2020-11-03 5:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 4:35 [PATCH 01/18] powerpc/pci: Add ppc_md.discover_phbs() Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 02/18] powerpc/{powernv,pseries}: Move PHB discovery Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 03/18] powerpc/maple: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 04/18] powerpc/512x: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 05/18] powerpc/52xx/efika: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 06/18] powerpc/52xx/lite5200: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 07/18] powerpc/52xx/media5200: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 08/18] powerpc/52xx/mpc5200_simple: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 09/18] powerpc/82xx/*: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 10/18] powerpc/83xx: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 11/18] powerpc/amigaone: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 12/18] powerpc/chrp: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 13/18] powerpc/embedded6xx/holly: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 14/18] powerpc/embedded6xx/linkstation: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 15/18] powerpc/embedded6xx/mpc7448: " Oliver O'Halloran
2020-11-03 4:35 ` Oliver O'Halloran [this message]
2020-11-03 4:35 ` [PATCH 17/18] powerpc/pasemi: " Oliver O'Halloran
2020-11-03 4:35 ` [PATCH 18/18] powerpc/powermac: " Oliver O'Halloran
2020-11-04 4:07 ` [PATCH 01/18] powerpc/pci: Add ppc_md.discover_phbs() kernel test robot
2020-11-04 4:07 ` kernel test robot
2021-02-10 12:57 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201103043523.916109-16-oohall@gmail.com \
--to=oohall@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.