Merge tag 'fixes-3.10-2' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper, mvebu fixes for v3.10 (round 2):
 - mvebu (and orion SoCs)
    - remove init_dma_coherent_pool_size()
 - mvebu
    - fix ranges DT property
    - fix DT reg value for L2 cache
    - select ARCH_REQUIRE_GPIOLIB
 - orion legacy
    - fix num_resources and id for ge10 and ge11

* tag 'fixes-3.10-2' of git://git.infradead.org/users/jcooper/linux:
  ARM: dts: mvebu: Fix wrong the address reg value for the L2-cache node
  ARM: plat-orion: Fix num_resources and id for ge10 and ge11
  arm: mvebu: fix the 'ranges' property to handle PCIe
  ARM: mvebu: select ARCH_REQUIRE_GPIOLIB for mvebu platform
  ARM: mvebu: Fix ranges entry on XP GP board
  ARM: Orion: Remove redundant init_dma_coherent_pool_size()

Signed-off-by: Olof Johansson <olof@lixom.net>

3 files changed, 8 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 272bbc65fab0..550eb772c30e 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -33,7 +33,8 @@
                 #size-cells = <1>;
                 compatible = "simple-bus";
                 interrupt-parent = <&mpic>;
-                ranges = <0 0 0xd0000000 0x100000>;
+                ranges = <0          0 0xd0000000 0x0100000 /* internal registers */
+                          0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
 
                 internal-regs {
                         compatible = "simple-bus";
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 0c9130b6fb80..aee2b1866ce2 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -29,7 +29,8 @@
         };
 
         soc {
-                ranges = <0 0xd0000000 0x100000>;
+                ranges = <0          0xd0000000 0x0100000 /* internal registers */
+                          0xe0000000 0xe0000000 0x8100000 /* PCIe */>;
                 internal-regs {
                         system-controller@18200 {
                                 compatible = "marvell,armada-370-xp-system-controller";
@@ -38,7 +39,7 @@
 
                         L2: l2-cache {
                                 compatible = "marvell,aurora-outer-cache";
-                                reg = <0xd0008000 0x1000>;
+                                reg = <0x08000 0x1000>;
                                 cache-id-part = <0x100>;
                                 wt-override;
                         };
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 26ad06fc147e..3ee63d128e27 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -39,6 +39,9 @@
         };
 
         soc {
+                ranges = <0          0 0xd0000000 0x100000
+                          0xf0000000 0 0xf0000000 0x1000000>;
+
                 internal-regs {
                         serial@12000 {
                                 clock-frequency = <250000000>;