From: Oliver O'Halloran <oohall@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Subject: [RFC PATCH 15/18] powerpc/embedded6xx/mpc7448: Move PHB discovery
Date: Thu, 24 Sep 2020 16:38:16 +1000 [thread overview]
Message-ID: <20200924063819.262830-15-oohall@gmail.com> (raw)
In-Reply-To: <20200924063819.262830-1-oohall@gmail.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
compile tested with mpc7448_hpc2_defconfig
---
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 15437abe1f6d..20b727584e40 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -58,16 +58,14 @@ int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
return PCIBIOS_SUCCESSFUL;
}
-static void __init mpc7448_hpc2_setup_arch(void)
+static void __init mpc7448_hpc2_setup_pci(void)
{
+#ifdef CONFIG_PCI
struct device_node *np;
if (ppc_md.progress)
- ppc_md.progress("mpc7448_hpc2_setup_arch():set_bridge", 0);
-
- tsi108_csr_vir_base = get_vir_csrbase();
+ ppc_md.progress("mpc7448_hpc2_setup_pci():set_bridge", 0);
/* setup PCI host bridge */
-#ifdef CONFIG_PCI
for_each_compatible_node(np, "pci", "tsi108-pci")
tsi108_setup_pci(np, MPC7448HPC2_PCI_CFG_PHYS, 0);
@@ -75,6 +73,11 @@ static void __init mpc7448_hpc2_setup_arch(void)
if (ppc_md.progress)
ppc_md.progress("tsi108: resources set", 0x100);
#endif
+}
+
+static void __init mpc7448_hpc2_setup_arch(void)
+{
+ tsi108_csr_vir_base = get_vir_csrbase();
printk(KERN_INFO "MPC7448HPC2 (TAIGA) Platform\n");
printk(KERN_INFO
@@ -180,6 +183,7 @@ define_machine(mpc7448_hpc2){
.name = "MPC7448 HPC2",
.probe = mpc7448_hpc2_probe,
.setup_arch = mpc7448_hpc2_setup_arch,
+ .discover_phbs = mpc7448_hpc2_setup_pci,
.init_IRQ = mpc7448_hpc2_init_IRQ,
.show_cpuinfo = mpc7448_hpc2_show_cpuinfo,
.get_irq = mpic_get_irq,
--
2.26.2
next prev parent reply other threads:[~2020-09-24 7:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 6:38 [RFC PATCH 01/18] powerpc/pci: Add ppc_md.discover_phbs() Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 02/18] powerpc/{powernv,pseries}: Move PHB discovery Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 03/18] powerpc/maple: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 04/18] powerpc/512x: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 05/18] powerpc/52xx/efika: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 06/18] powerpc/52xx/lite5200: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 07/18] powerpc/52xx/media5200: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 08/18] powerpc/52xx/mpc5200_simple: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 09/18] powerpc/82xx/*: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 10/18] powerpc/83xx: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 11/18] powerpc/amigaone: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 12/18] powerpc/chrp: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 13/18] powerpc/embedded6xx/holly: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 14/18] powerpc/embedded6xx/linkstation: " Oliver O'Halloran
2020-09-24 6:38 ` Oliver O'Halloran [this message]
2020-09-24 6:38 ` [RFC PATCH 16/18] powerpc/embedded6xx/mve5100: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 17/18] powerpc/pasemi: " Oliver O'Halloran
2020-09-24 6:38 ` [RFC PATCH 18/18] powerpc/powermac: " Oliver O'Halloran
2020-09-27 7:25 ` Christophe Leroy
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=20200924063819.262830-15-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).