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

powerpc/embedded6xx/mpc7448: 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-15-oohall@gmail.com
parent daa6c247

arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c

+9 −5
Original line number Diff line number Diff line
@@ -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
@@ -181,6 +184,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,