Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c
index d41d41d78ad9..54c84a492a0f 100644
--- a/arch/arm/plat-orion/pcie.c
+++ b/arch/arm/plat-orion/pcie.c
@@ -133,6 +133,12 @@ static void __init orion_pcie_setup_wins(void __iomem *base,
         }
 
         /*
+         * Round up 'size' to the nearest power of two.
+         */
+        if ((size & (size - 1)) != 0)
+                size = 1 << fls(size);
+
+        /*
          * Setup BAR[1] to all DRAM banks.
          */
         writel(dram->cs[0].base, base + PCIE_BAR_LO_OFF(1));