1 files changed, 14 insertions, 6 deletions

diff --git a/arch/mips/loongson/common/pci.c b/arch/mips/loongson/common/pci.c
index a3a4abfb6c9a..31d8c5ecd16c 100644
--- a/arch/mips/loongson/common/pci.c
+++ b/arch/mips/loongson/common/pci.c
@@ -27,7 +27,7 @@ static struct resource loongson_pci_io_resource = {
 };
 
 static struct pci_controller  loongson_pci_controller = {
-        .pci_ops        = &bonito64_pci_ops,
+        .pci_ops        = &loongson_pci_ops,
         .io_resource    = &loongson_pci_io_resource,
         .mem_resource   = &loongson_pci_mem_resource,
         .mem_offset     = 0x00000000UL,
@@ -44,15 +44,15 @@ static void __init setup_pcimap(void)
          * pcimap: PCI_MAP2  PCI_Mem_Lo2 PCI_Mem_Lo1 PCI_Mem_Lo0
          *           [<2G]   [384M,448M] [320M,384M] [0M,64M]
          */
-        BONITO_PCIMAP = BONITO_PCIMAP_PCIMAP_2 |
-                BONITO_PCIMAP_WIN(2, BONITO_PCILO2_BASE) |
-                BONITO_PCIMAP_WIN(1, BONITO_PCILO1_BASE) |
-                BONITO_PCIMAP_WIN(0, 0);
+        LOONGSON_PCIMAP = LOONGSON_PCIMAP_PCIMAP_2 |
+                LOONGSON_PCIMAP_WIN(2, LOONGSON_PCILO2_BASE) |
+                LOONGSON_PCIMAP_WIN(1, LOONGSON_PCILO1_BASE) |
+                LOONGSON_PCIMAP_WIN(0, 0);
 
         /*
          * PCI-DMA to local mapping: [2G,2G+256M] -> [0M,256M]
          */
-        BONITO_PCIBASE0 = 0x80000000ul;   /* base: 2G -> mmap: 0M */
+        LOONGSON_PCIBASE0 = 0x80000000ul;   /* base: 2G -> mmap: 0M */
         /* size: 256M, burst transmission, pre-fetch enable, 64bit */
         LOONGSON_PCI_HIT0_SEL_L = 0xc000000cul;
         LOONGSON_PCI_HIT0_SEL_H = 0xfffffffful;
@@ -67,6 +67,14 @@ static void __init setup_pcimap(void)
         /* can not change gnt to break pci transfer when device's gnt not
         deassert for some broken device */
         LOONGSON_PXARB_CFG = 0x00fe0105ul;
+
+#ifdef CONFIG_CPU_SUPPORTS_ADDRWINCFG
+        /*
+         * set cpu addr window2 to map CPU address space to PCI address space
+         */
+        LOONGSON_ADDRWIN_CPUTOPCI(ADDRWIN_WIN2, LOONGSON_CPU_MEM_SRC,
+                LOONGSON_PCI_MEM_DST, MMAP_CPUTOPCI_SIZE);
+#endif
 }
 
 static int __init pcibios_init(void)