Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / kirkwood.dtsi

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 5d7b759f06a80b8502a2f49829b1537f8d54e8c7..9809fc1f105ccf683ede2fc11afee659a483a5dc 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -30,7 +30,9 @@
 
        ocp@f1000000 {
                compatible = "simple-bus";
-               ranges = <0x00000000 0xf1000000 0x4000000
+               ranges = <0x00000000 0xf1000000 0x0100000
+                         0xe0000000 0xe0000000 0x8100000 /* PCIE */
+                         0xf4000000 0xf4000000 0x0000400
                          0xf5000000 0xf5000000 0x0000400>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -163,7 +165,7 @@
                        ale = <1>;
                        bank-width = <1>;
                        compatible = "marvell,orion-nand";
-                       reg = <0x3000000 0x400>;
+                       reg = <0xf4000000 0x400>;
                        chip-delay = <25>;
                        /* set partition map and/or chip-delay in board dts */
                        clocks = <&gate_clk 7>;