From: Oliver O'Halloran <oohall@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Subject: [PATCH 13/18] powerpc/embedded6xx/holly: Move PHB discovery
Date: Tue, 3 Nov 2020 15:35:18 +1100 [thread overview]
Message-ID: <20201103043523.916109-13-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 holly_defconfig
---
arch/powerpc/platforms/embedded6xx/holly.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index d8f2e2c737bb..53065d564161 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -108,15 +108,13 @@ static void holly_remap_bridge(void)
tsi108_write_reg(TSI108_PCI_P2O_BAR2, 0x0);
}
-static void __init holly_setup_arch(void)
+static void __init holly_init_pci(void)
{
struct device_node *np;
if (ppc_md.progress)
ppc_md.progress("holly_setup_arch():set_bridge", 0);
- tsi108_csr_vir_base = get_vir_csrbase();
-
/* setup PCI host bridge */
holly_remap_bridge();
@@ -127,6 +125,11 @@ static void __init holly_setup_arch(void)
ppc_md.pci_exclude_device = holly_exclude_device;
if (ppc_md.progress)
ppc_md.progress("tsi108: resources set", 0x100);
+}
+
+static void __init holly_setup_arch(void)
+{
+ tsi108_csr_vir_base = get_vir_csrbase();
printk(KERN_INFO "PPC750GX/CL Platform\n");
}
@@ -259,6 +262,7 @@ define_machine(holly){
.name = "PPC750 GX/CL TSI",
.probe = holly_probe,
.setup_arch = holly_setup_arch,
+ .discover_phbs = holly_init_pci,
.init_IRQ = holly_init_IRQ,
.show_cpuinfo = holly_show_cpuinfo,
.get_irq = mpic_get_irq,
--
2.26.2
next prev parent reply other threads:[~2020-11-03 4:58 UTC|newest]
Thread overview: 20+ 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 ` Oliver O'Halloran [this message]
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 ` [PATCH 16/18] powerpc/embedded6xx/mve5100: " Oliver O'Halloran
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
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-13-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).