diff options
Diffstat (limited to 'arch/powerpc/sysdev/ppc4xx_pci.c')
-rw-r--r-- | arch/powerpc/sysdev/ppc4xx_pci.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index 4914fd3f41ec..5a4f61ee6b33 100644 --- a/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/arch/powerpc/sysdev/ppc4xx_pci.c | |||
@@ -1440,7 +1440,8 @@ static int __init ppc4xx_pciex_check_core_init(struct device_node *np) | |||
1440 | ppc4xx_pciex_hwops = &ppc405ex_pcie_hwops; | 1440 | ppc4xx_pciex_hwops = &ppc405ex_pcie_hwops; |
1441 | #endif | 1441 | #endif |
1442 | #ifdef CONFIG_476FPE | 1442 | #ifdef CONFIG_476FPE |
1443 | if (of_device_is_compatible(np, "ibm,plb-pciex-476fpe")) | 1443 | if (of_device_is_compatible(np, "ibm,plb-pciex-476fpe") |
1444 | || of_device_is_compatible(np, "ibm,plb-pciex-476gtr")) | ||
1444 | ppc4xx_pciex_hwops = &ppc_476fpe_pcie_hwops; | 1445 | ppc4xx_pciex_hwops = &ppc_476fpe_pcie_hwops; |
1445 | #endif | 1446 | #endif |
1446 | if (ppc4xx_pciex_hwops == NULL) { | 1447 | if (ppc4xx_pciex_hwops == NULL) { |
@@ -1751,7 +1752,10 @@ static int __init ppc4xx_setup_one_pciex_POM(struct ppc4xx_pciex_port *port, | |||
1751 | dcr_write(port->dcrs, DCRO_PEGPL_OMR1MSKL, | 1752 | dcr_write(port->dcrs, DCRO_PEGPL_OMR1MSKL, |
1752 | sa | DCRO_PEGPL_460SX_OMR1MSKL_UOT | 1753 | sa | DCRO_PEGPL_460SX_OMR1MSKL_UOT |
1753 | | DCRO_PEGPL_OMRxMSKL_VAL); | 1754 | | DCRO_PEGPL_OMRxMSKL_VAL); |
1754 | else if (of_device_is_compatible(port->node, "ibm,plb-pciex-476fpe")) | 1755 | else if (of_device_is_compatible( |
1756 | port->node, "ibm,plb-pciex-476fpe") || | ||
1757 | of_device_is_compatible( | ||
1758 | port->node, "ibm,plb-pciex-476gtr")) | ||
1755 | dcr_write(port->dcrs, DCRO_PEGPL_OMR1MSKL, | 1759 | dcr_write(port->dcrs, DCRO_PEGPL_OMR1MSKL, |
1756 | sa | DCRO_PEGPL_476FPE_OMR1MSKL_UOT | 1760 | sa | DCRO_PEGPL_476FPE_OMR1MSKL_UOT |
1757 | | DCRO_PEGPL_OMRxMSKL_VAL); | 1761 | | DCRO_PEGPL_OMRxMSKL_VAL); |
@@ -1881,7 +1885,10 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port, | |||
1881 | sa |= PCI_BASE_ADDRESS_MEM_PREFETCH; | 1885 | sa |= PCI_BASE_ADDRESS_MEM_PREFETCH; |
1882 | 1886 | ||
1883 | if (of_device_is_compatible(port->node, "ibm,plb-pciex-460sx") || | 1887 | if (of_device_is_compatible(port->node, "ibm,plb-pciex-460sx") || |
1884 | of_device_is_compatible(port->node, "ibm,plb-pciex-476fpe")) | 1888 | of_device_is_compatible( |
1889 | port->node, "ibm,plb-pciex-476fpe") || | ||
1890 | of_device_is_compatible( | ||
1891 | port->node, "ibm,plb-pciex-476gtr")) | ||
1885 | sa |= PCI_BASE_ADDRESS_MEM_TYPE_64; | 1892 | sa |= PCI_BASE_ADDRESS_MEM_TYPE_64; |
1886 | 1893 | ||
1887 | out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa)); | 1894 | out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa)); |