Merge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / Documentation / devicetree / bindings / soc / fsl / qman.txt

diff --git a/Documentation/devicetree/bindings/soc/fsl/qman.txt b/Documentation/devicetree/bindings/soc/fsl/qman.txt
index 063e3a0..556ebb8 100644 (file)
--- a/Documentation/devicetree/bindings/soc/fsl/qman.txt
+++ b/Documentation/devicetree/bindings/soc/fsl/qman.txt
@@ -38,6 +38,11 @@ are located at offsets 0xbf8 and 0xbfc
        Value type:     <prop-encoded-array>
        Definition:     Standard property. The error interrupt
 
+- fsl,qman-portals
+       Usage:          Required
+       Value type:     <phandle>
+       Definition:     Phandle to this QMan instance's portals
+
 - fsl,liodn
        Usage:          See pamu.txt
        Value type:     <prop-encoded-array>
@@ -113,13 +118,13 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes
 
                qman_fqd: qman-fqd {
                        compatible = "fsl,qman-fqd";
-                       alloc-ranges = <0 0 0xf 0xffffffff>;
+                       alloc-ranges = <0 0 0x10 0>;
                        size = <0 0x400000>;
                        alignment = <0 0x400000>;
                };
                qman_pfdr: qman-pfdr {
                        compatible = "fsl,qman-pfdr";
-                       alloc-ranges = <0 0 0xf 0xffffffff>;
+                       alloc-ranges = <0 0 0x10 0>;
                        size = <0 0x2000000>;
                        alignment = <0 0x2000000>;
                };
@@ -127,6 +132,10 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes
 
 The example below shows a (P4080) QMan CCSR-space node
 
+       qportals: qman-portals@ff4200000 {
+               ...
+       };
+
        clockgen: global-utilities@e1000 {
                ...
                sysclk: sysclk {
@@ -154,6 +163,7 @@ The example below shows a (P4080) QMan CCSR-space node
                reg = <0x318000 0x1000>;
                interrupts = <16 2 1 3>
                fsl,liodn = <0x16>;
+               fsl,qman-portals = <&qportals>;
                memory-region = <&qman_fqd &qman_pfdr>;
                clocks = <&platform_pll 1>;
        };