]> git.itanic.dy.fi Git - linux-stable/commitdiff
powerpc/86xx: mpc86xx_hpcn: Call uli_init() instead of explicit ppc_md assignment
authorPali Rohár <pali@kernel.org>
Sun, 9 Apr 2023 00:08:11 +0000 (02:08 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 20 Apr 2023 00:20:50 +0000 (10:20 +1000)
After calling fsl_pci_assign_primary(), it is possible to use uli_init() to
conditionally initialize ppc_md.pci_exclude_device callback based on the
uli1575 detection.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230409000812.18904-8-pali@kernel.org
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

index 645125cc84209adf8bd59bc795bf0f509b79bbe7..812110673d8821208cd179926e80400bc16ee47f 100644 (file)
@@ -46,10 +46,6 @@ mpc86xx_hpcn_setup_arch(void)
        if (ppc_md.progress)
                ppc_md.progress("mpc86xx_hpcn_setup_arch()", 0);
 
-#ifdef CONFIG_PCI
-       ppc_md.pci_exclude_device = uli_exclude_device;
-#endif
-
        printk("MPC86xx HPCN board from Freescale Semiconductor\n");
 
 #ifdef CONFIG_SMP
@@ -57,6 +53,7 @@ mpc86xx_hpcn_setup_arch(void)
 #endif
 
        fsl_pci_assign_primary();
+       uli_init();
 
        swiotlb_detect_4g();
 }