Commit 83f84041 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/83xx: 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-10-oohall@gmail.com
parent 3c82a6ae

arch/powerpc/platforms/83xx/asp834x.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ define_machine(asp834x) { 
	.name			= "ASP8347E",

	.probe			= asp834x_probe,

	.setup_arch		= asp834x_setup_arch,

	.discover_phbs		= mpc83xx_setup_pci,

	.init_IRQ		= mpc83xx_ipic_init_IRQ,

	.get_irq		= ipic_get_irq,

	.restart		= mpc83xx_restart,

arch/powerpc/platforms/83xx/km83xx.c

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ define_machine(mpc83xx_km) { 
	.name		= "mpc83xx-km-platform",

	.probe		= mpc83xx_km_probe,

	.setup_arch	= mpc83xx_km_setup_arch,

	.discover_phbs	= mpc83xx_setup_pci,

	.init_IRQ	= mpc83xx_ipic_init_IRQ,

	.get_irq	= ipic_get_irq,

	.restart	= mpc83xx_restart,

arch/powerpc/platforms/83xx/misc.c

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ void __init mpc83xx_setup_arch(void) 
		setbat(-1, va, immrbase, immrsize, PAGE_KERNEL_NCG);

		update_bats();

	}



	mpc83xx_setup_pci();

}



int machine_check_83xx(struct pt_regs *regs)

arch/powerpc/platforms/83xx/mpc830x_rdb.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ define_machine(mpc830x_rdb) { 
	.name			= "MPC830x RDB",

	.probe			= mpc830x_rdb_probe,

	.setup_arch		= mpc830x_rdb_setup_arch,

	.discover_phbs		= mpc83xx_setup_pci,

	.init_IRQ		= mpc83xx_ipic_init_IRQ,

	.get_irq		= ipic_get_irq,

	.restart		= mpc83xx_restart,

arch/powerpc/platforms/83xx/mpc831x_rdb.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ define_machine(mpc831x_rdb) { 
	.name			= "MPC831x RDB",

	.probe			= mpc831x_rdb_probe,

	.setup_arch		= mpc831x_rdb_setup_arch,

	.discover_phbs		= mpc83xx_setup_pci,

	.init_IRQ		= mpc83xx_ipic_init_IRQ,

	.get_irq		= ipic_get_irq,

	.restart		= mpc83xx_restart,