Merge tag 'kbuild-misc-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahi...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / integratorap.dts

diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts
index a5d88a213dcda47c0756a53dc6c516dffeb4455b..94d2ff9836d00367a086f01a69bb16acd95008dd 100644 (file)
--- a/arch/arm/boot/dts/integratorap.dts
+++ b/arch/arm/boot/dts/integratorap.dts
@@ -154,21 +154,26 @@
        };
 
        pci: pciv3@62000000 {
-               compatible = "v3,v360epc-pci";
+               compatible = "arm,integrator-ap-pci", "v3,v360epc-pci";
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
-               reg = <0x62000000 0x10000>;
+               /* Bridge registers and config access space */
+               reg = <0x62000000 0x10000>, <0x61000000 0x01000000>;
                interrupt-parent = <&pic>;
                interrupts = <17>; /* Bus error IRQ */
-               ranges = <0x00000000 0 0x61000000 /* config space */
-                       0x61000000 0 0x00100000 /* 16 MiB @ 61000000 */
-                       0x01000000 0 0x0 /* I/O space */
-                       0x60000000 0 0x00100000 /* 16 MiB @ 60000000 */
-                       0x02000000 0 0x00000000 /* non-prefectable memory */
-                       0x40000000 0 0x10000000 /* 256 MiB @ 40000000 */
-                       0x42000000 0 0x10000000 /* prefetchable memory */
-                       0x50000000 0 0x10000000>; /* 256 MiB @ 50000000 */
+               clocks = <&pciclk>;
+               bus-range = <0x00 0xff>;
+               ranges = <0x01000000 0 0x0000000 /* I/O space @00000000 */
+                       0x60000000 0 0x00010000 /* 64 KB @ LB 60000000 */
+                       0x02000000 0 0x40000000 /* non-prefectable memory @40000000 */
+                       0x40000000 0 0x10000000 /* 256 MiB @ LB 40000000 1:1 */
+                       0x42000000 0 0x50000000 /* prefetchable memory @50000000 */
+                       0x50000000 0 0x10000000>; /* 256 MiB @ LB 50000000 1:1 */
+               dma-ranges = <0x02000000 0 0x20000000 /* EBI memory space */
+                       0x20000000 0 0x20000000 /* 512 MB @ LB 20000000 1:1 */
+                       0x02000000 0 0x80000000 /* Core module alias memory */
+                       0x80000000 0 0x40000000>; /* 1GB @ LB 80000000 */
                interrupt-map-mask = <0xf800 0 0 0x7>;
                interrupt-map = <
                /* IDSEL 9 */