Merge branch 'next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

1 files changed, 11 insertions, 12 deletions

diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index fb368dfde5d4..5da8a44ea2f6 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -30,14 +30,12 @@
 #include <asm/machdep.h>
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
+#include <mm/mmu_decl.h>
 
 #include "ppc4xx_pci.h"
 
 static int dma_offset_set;
 
-/* Move that to a useable header */
-extern unsigned long total_memory;
-
 #define U64_TO_U32_LOW(val)     ((u32)((val) & 0x00000000ffffffffULL))
 #define U64_TO_U32_HIGH(val)    ((u32)((val) >> 32))
 
@@ -105,7 +103,8 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,
 
         /* Default */
         res->start = 0;
-        res->end = size = 0x80000000;
+        size = 0x80000000;
+        res->end = size - 1;
         res->flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;
 
         /* Get dma-ranges property */
@@ -167,13 +166,13 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,
          */
         if (size < total_memory) {
                 printk(KERN_ERR "%s: dma-ranges too small "
-                       "(size=%llx total_memory=%lx)\n",
-                       hose->dn->full_name, size, total_memory);
+                       "(size=%llx total_memory=%llx)\n",
+                       hose->dn->full_name, size, (u64)total_memory);
                 return -ENXIO;
         }
 
         /* Check we are a power of 2 size and that base is a multiple of size*/
-        if (!is_power_of_2(size) ||
+        if ((size & (size - 1)) != 0  ||
             (res->start & (size - 1)) != 0) {
                 printk(KERN_ERR "%s: dma-ranges unaligned\n",
                        hose->dn->full_name);
@@ -810,7 +809,7 @@ static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
         switch (port->index) {
         case 0:
                 mtdcri(SDR0, PESDR0_460EX_L0CDRCTL, 0x00003230);
-                mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000136);
+                mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000130);
                 mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
 
                 mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST,0x10000000);
@@ -821,10 +820,10 @@ static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
                 mtdcri(SDR0, PESDR1_460EX_L1CDRCTL, 0x00003230);
                 mtdcri(SDR0, PESDR1_460EX_L2CDRCTL, 0x00003230);
                 mtdcri(SDR0, PESDR1_460EX_L3CDRCTL, 0x00003230);
-                mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000136);
-                mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000136);
-                mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000136);
-                mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000136);
+                mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000130);
+                mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000130);
+                mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000130);
+                mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000130);
                 mtdcri(SDR0, PESDR1_460EX_L0CLK, 0x00000006);
                 mtdcri(SDR0, PESDR1_460EX_L1CLK, 0x00000006);
                 mtdcri(SDR0, PESDR1_460EX_L2CLK, 0x00000006);