[PATCH v2 04/10] powerpc/47x: Split ppc47x machine in two

[Christophe Leroy]

This machine matches two compatibles and sets .pci_irq_fixup
on one of them.

Split it into two machines, then the probe function can be dropped.

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
v2: Also update/duplicate machine_{device/arch}_initcall
---
 arch/powerpc/platforms/44x/ppc476.c | 37 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/arch/powerpc/platforms/44x/ppc476.c 
b/arch/powerpc/platforms/44x/ppc476.c
index 7c91ac5a5241..11f939ee98c4 100644
--- a/arch/powerpc/platforms/44x/ppc476.c
+++ b/arch/powerpc/platforms/44x/ppc476.c
@@ -114,7 +114,8 @@ static int __init ppc47x_device_probe(void)
 
        return 0;
 }
-machine_device_initcall(ppc47x, ppc47x_device_probe);
+machine_device_initcall(ppc47x_akebono, ppc47x_device_probe);
+machine_device_initcall(ppc47x_currituck, ppc47x_device_probe);
 
 static void __init ppc47x_init_irq(void)
 {
@@ -249,7 +250,8 @@ static int __init ppc47x_get_board_rev(void)
        pr_info("%s: Unable to find board revision\n", __func__);
        return 0;
 }
-machine_arch_initcall(ppc47x, ppc47x_get_board_rev);
+machine_arch_initcall(ppc47x_akebono, ppc47x_get_board_rev);
+machine_arch_initcall(ppc47x_currituck, ppc47x_get_board_rev);
 
 /* Use USB controller should have been hardware swizzled but it wasn't :( */
 static void ppc47x_pci_irq_fixup(struct pci_dev *dev)
@@ -268,27 +270,24 @@ static void ppc47x_pci_irq_fixup(struct pci_dev *dev)
        }
 }
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init ppc47x_probe(void)
-{
-       if (of_machine_is_compatible("ibm,akebono"))
-               return 1;
-
-       if (of_machine_is_compatible("ibm,currituck")) {
-               ppc_md.pci_irq_fixup = ppc47x_pci_irq_fixup;
-               return 1;
-       }
-
-       return 0;
-}
+define_machine(ppc47x_akebono) {
+       .name                   = "PowerPC 47x (akebono)",
+       .compatible             = "ibm,akebono",
+       .probe                  = ppc47x_probe,
+       .progress               = udbg_progress,
+       .init_IRQ               = ppc47x_init_irq,
+       .setup_arch             = ppc47x_setup_arch,
+       .restart                = ppc4xx_reset_system,
+       .calibrate_decr         = generic_calibrate_decr,
+};
 
-define_machine(ppc47x) {
-       .name                   = "PowerPC 47x",
+define_machine(ppc47x_currituck) {
+       .name                   = "PowerPC 47x (currituck)",
+       .compatible             = "ibm,currituck",
        .probe                  = ppc47x_probe,
        .progress               = udbg_progress,
        .init_IRQ               = ppc47x_init_irq,
+       .pci_irq_fixup          = ppc47x_pci_irq_fixup,
        .setup_arch             = ppc47x_setup_arch,
        .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
-- 
2.39.1