forked from Minki/linux
powerpc/83xx: Move PHB discovery
Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20201103043523.916109-10-oohall@gmail.com
This commit is contained in:
parent
3c82a6aecd
commit
83f84041ff
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -101,6 +101,7 @@ define_machine(mpc832x_mds) {
|
||||
.name = "MPC832x MDS",
|
||||
.probe = mpc832x_sys_probe,
|
||||
.setup_arch = mpc832x_sys_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
@ -219,6 +219,7 @@ define_machine(mpc832x_rdb) {
|
||||
.name = "MPC832x RDB",
|
||||
.probe = mpc832x_rdb_probe,
|
||||
.setup_arch = mpc832x_rdb_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
@ -70,6 +70,7 @@ define_machine(mpc834x_itx) {
|
||||
.name = "MPC834x ITX",
|
||||
.probe = mpc834x_itx_probe,
|
||||
.setup_arch = mpc834x_itx_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
@ -91,6 +91,7 @@ define_machine(mpc834x_mds) {
|
||||
.name = "MPC834x MDS",
|
||||
.probe = mpc834x_mds_probe,
|
||||
.setup_arch = mpc834x_mds_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
@ -201,6 +201,7 @@ define_machine(mpc836x_mds) {
|
||||
.name = "MPC836x MDS",
|
||||
.probe = mpc836x_mds_probe,
|
||||
.setup_arch = mpc836x_mds_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
@ -41,6 +41,7 @@ define_machine(mpc836x_rdk) {
|
||||
.name = "MPC836x RDK",
|
||||
.probe = mpc836x_rdk_probe,
|
||||
.setup_arch = mpc836x_rdk_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
@ -93,6 +93,7 @@ define_machine(mpc837x_mds) {
|
||||
.name = "MPC837x MDS",
|
||||
.probe = mpc837x_mds_probe,
|
||||
.setup_arch = mpc837x_mds_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
@ -73,6 +73,7 @@ define_machine(mpc837x_rdb) {
|
||||
.name = "MPC837x RDB/WLAN",
|
||||
.probe = mpc837x_rdb_probe,
|
||||
.setup_arch = mpc837x_rdb_setup_arch,
|
||||
.discover_phbs = mpc83xx_setup_pci,
|
||||
.init_IRQ = mpc83xx_ipic_init_IRQ,
|
||||
.get_irq = ipic_get_irq,
|
||||
.restart = mpc83xx_restart,
|
||||
|
Loading…
Reference in New Issue
Block a user