Merge branch 'denx'

diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index b5d868feacbe46210b5df4e62095bd90728e805d..7625cccec7ebc9455efb87351d7e627b4339a4c0 100644 (file)
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -67,7 +67,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)
        debug ("R0 bus_start: %llx phys_start: %llx size: %llx\n",
                (u64)bus_start, (u64)phys_start, (u64)pci_sz);
        pci_set_region(r++, bus_start, phys_start, pci_sz,
-                       PCI_REGION_MEM | PCI_REGION_MEMORY | \
+                       PCI_REGION_MEM | PCI_REGION_MEMORY |
                        PCI_REGION_PREFETCH);
 
        sz -= pci_sz;
@@ -79,7 +79,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)
                debug ("R1 bus_start: %llx phys_start: %llx size: %llx\n",
                        (u64)bus_start, (u64)phys_start, (u64)pci_sz);
                pci_set_region(r++, bus_start, phys_start, pci_sz,
-                               PCI_REGION_MEM | PCI_REGION_MEMORY | \
+                               PCI_REGION_MEM | PCI_REGION_MEMORY |
                                PCI_REGION_PREFETCH);
                sz -= pci_sz;
                bus_start += pci_sz;
@@ -87,19 +87,23 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)
        }
 
 #if defined(CONFIG_PHYS_64BIT) && defined(CONFIG_SYS_PCI_64BIT)
+       /*
+        * On 64-bit capable systems, set up a mapping for all of DRAM
+        * in high pci address space.
+        */
        pci_sz = 1ull << __ilog2_u64(gd->ram_size);
        /* round up to the next largest power of two */
        if (gd->ram_size > pci_sz)
-               sz = 1ull << (__ilog2_u64(gd->ram_size) + 1);
+               pci_sz = 1ull << (__ilog2_u64(gd->ram_size) + 1);
        debug ("R64 bus_start: %llx phys_start: %llx size: %llx\n",
-               (u64)CONFIG_SYS_PCI_MEMORY_BUS,
+               (u64)CONFIG_SYS_PCI64_MEMORY_BUS,
                (u64)CONFIG_SYS_PCI_MEMORY_PHYS,
                (u64)pci_sz);
        pci_set_region(r++,
-                       CONFIG_SYS_PCI_MEMORY_BUS,
+                       CONFIG_SYS_PCI64_MEMORY_BUS,
                        CONFIG_SYS_PCI_MEMORY_PHYS,
                        pci_sz,
-                       PCI_REGION_MEM | PCI_REGION_MEMORY | \
+                       PCI_REGION_MEM | PCI_REGION_MEMORY |
                        PCI_REGION_PREFETCH);
 #else
        pci_sz = 1ull << __ilog2_u64(sz);
@@ -107,7 +111,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)
                debug ("R2 bus_start: %llx phys_start: %llx size: %llx\n",
                        (u64)bus_start, (u64)phys_start, (u64)pci_sz);
                pci_set_region(r++, bus_start, phys_start, pci_sz,
-                               PCI_REGION_MEM | PCI_REGION_MEMORY | \
+                               PCI_REGION_MEM | PCI_REGION_MEMORY |
                                PCI_REGION_PREFETCH);
                sz -= pci_sz;
                bus_start += pci_sz;
@@ -147,7 +151,7 @@ void fsl_pci_init(struct pci_controller *hose)
        for (r=0; r<hose->region_count; r++) {
                u32 sz = (__ilog2_u64((u64)hose->regions[r].size) - 1);
                if (hose->regions[r].flags & PCI_REGION_MEMORY) { /* inbound */
-                       u32 flag = PIWAR_EN | PIWAR_LOCAL | \
+                       u32 flag = PIWAR_EN | PIWAR_LOCAL |
                                        PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;
                        pi->pitar = (hose->regions[r].phys_start >> 12);
                        pi->piwbar = (hose->regions[r].bus_start >> 12);
@@ -170,10 +174,10 @@ void fsl_pci_init(struct pci_controller *hose)
                        po->potear = 0;
 #endif
                        if (hose->regions[r].flags & PCI_REGION_IO)
-                               po->powar = POWAR_EN | sz | \
+                               po->powar = POWAR_EN | sz |
                                        POWAR_IO_READ | POWAR_IO_WRITE;
                        else
-                               po->powar = POWAR_EN | sz | \
+                               po->powar = POWAR_EN | sz |
                                        POWAR_MEM_READ | POWAR_MEM_WRITE;
                        po++;
                }

diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h
index ad3009901e9ccb95daff43b862cb16be9b458a71..4892d8b8c4d1ba7a11c9f5a60c327850d3a951d3 100644 (file)
--- a/include/asm-ppc/immap_85xx.h
+++ b/include/asm-ppc/immap_85xx.h
@@ -1568,7 +1568,7 @@ typedef struct ccsr_gur {
 #define MPC85xx_PORDEVSR_SGMII3_DIS    0x08000000
 #define MPC85xx_PORDEVSR_SGMII4_DIS    0x04000000
 #define MPC85xx_PORDEVSR_SRDS2_IO_SEL   0x38000000
-#define MPC85xx_PORDEVSR_IO_SEL                0x00380000
+#define MPC85xx_PORDEVSR_IO_SEL                0x00780000
 #define MPC85xx_PORDEVSR_PCI2_ARB      0x00040000
 #define MPC85xx_PORDEVSR_PCI1_ARB      0x00020000
 #define MPC85xx_PORDEVSR_PCI1_PCI32    0x00010000