1 files changed, 3 insertions, 2 deletions

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 4dfd61df8aba..a625dcf26b2b 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -122,7 +122,7 @@ static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask)
          * address width of the SoC such that we can address any internal
          * SoC address from across PCI if needed
          */
-        if ((dev->bus == &pci_bus_type) &&
+        if ((dev_is_pci(dev)) &&
             dma_mask >= DMA_BIT_MASK(MAX_PHYS_ADDR_BITS)) {
                 set_dma_ops(dev, &dma_direct_ops);
                 set_dma_offset(dev, pci64_dma_offset);
@@ -454,7 +454,7 @@ void fsl_pcibios_fixup_bus(struct pci_bus *bus)
         }
 }
 
-int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)
+int fsl_add_bridge(struct platform_device *pdev, int is_primary)
 {
         int len;
         struct pci_controller *hose;
@@ -1035,6 +1035,7 @@ static const struct of_device_id pci_ids[] = {
         { .compatible = "fsl,mpc8548-pcie", },
         { .compatible = "fsl,mpc8610-pci", },
         { .compatible = "fsl,mpc8641-pcie", },
+        { .compatible = "fsl,qoriq-pcie", },
         { .compatible = "fsl,qoriq-pcie-v2.1", },
         { .compatible = "fsl,qoriq-pcie-v2.2", },
         { .compatible = "fsl,qoriq-pcie-v2.3", },