Commit 407d418f authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/chrp: 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-12-oohall@gmail.com
parent 053d58c8

arch/powerpc/platforms/chrp/pci.c

+8 −0
Original line number Diff line number Diff line
@@ -314,6 +314,14 @@ chrp_find_bridges(void) 
		}

	}

	of_node_put(root);



	/*

	 *  "Temporary" fixes for PCI devices.

	 *  -- Geert

	 */

	hydra_init();		/* Mac I/O */



	pci_create_OF_bus_map();

}



/* SL82C105 IDE Control/Status Register */

arch/powerpc/platforms/chrp/setup.c

+1 −11
Original line number Diff line number Diff line
@@ -334,22 +334,11 @@ static void __init chrp_setup_arch(void) 
	/* On pegasos, enable the L2 cache if not already done by OF */

	pegasos_set_l2cr();



	/* Lookup PCI host bridges */

	chrp_find_bridges();



	/*

	 *  Temporary fixes for PCI devices.

	 *  -- Geert

	 */

	hydra_init();		/* Mac I/O */



	/*

	 *  Fix the Super I/O configuration

	 */

	sio_init();



	pci_create_OF_bus_map();



	/*

	 * Print the banner, then scroll down so boot progress

	 * can be printed.  -- Cort
@@ -582,6 +571,7 @@ define_machine(chrp) { 
	.name			= "CHRP",

	.probe			= chrp_probe,

	.setup_arch		= chrp_setup_arch,

	.discover_phbs		= chrp_find_bridges,

	.init			= chrp_init2,

	.show_cpuinfo		= chrp_show_cpuinfo,

	.init_IRQ		= chrp_init_IRQ,