38 files changed, 1011 insertions, 426 deletions

diff --git a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
index edeea160ca39..edda55f74004 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/fman.txt
@@ -7,6 +7,7 @@ CONTENTS
   - FMan MURAM Node
   - FMan dTSEC/XGEC/mEMAC Node
   - FMan IEEE 1588 Node
+  - FMan MDIO Node
   - Example
 
 =============================================================================
@@ -357,6 +358,69 @@ ptp-timer@fe000 {
 };
 
 =============================================================================
+FMan MDIO Node
+
+DESCRIPTION
+
+The MDIO is a bus to which the PHY devices are connected.
+
+PROPERTIES
+
+- compatible
+                Usage: required
+                Value type: <stringlist>
+                Definition: A standard property.
+                Must include "fsl,fman-mdio" for 1 Gb/s MDIO from FMan v2.
+                Must include "fsl,fman-xmdio" for 10 Gb/s MDIO from FMan v2.
+                Must include "fsl,fman-memac-mdio" for 1/10 Gb/s MDIO from
+                FMan v3.
+
+- reg
+                Usage: required
+                Value type: <prop-encoded-array>
+                Definition: A standard property.
+
+- bus-frequency
+                Usage: optional
+                Value type: <u32>
+                Definition: Specifies the external MDIO bus clock speed to
+                be used, if different from the standard 2.5 MHz.
+                This may be due to the standard speed being unsupported (e.g.
+                due to a hardware problem), or to advertise that all relevant
+                components in the system support a faster speed.
+
+- interrupts
+                Usage: required for external MDIO
+                Value type: <prop-encoded-array>
+                Definition: Event interrupt of external MDIO controller.
+
+- fsl,fman-internal-mdio
+                Usage: required for internal MDIO
+                Value type: boolean
+                Definition: Fman has internal MDIO for internal PCS(Physical
+                Coding Sublayer) PHYs and external MDIO for external PHYs.
+                The settings and programming routines for internal/external
+                MDIO are different. Must be included for internal MDIO.
+
+EXAMPLE
+
+Example for FMan v2 external MDIO:
+
+mdio@f1000 {
+        compatible = "fsl,fman-xmdio";
+        reg = <0xf1000 0x1000>;
+        interrupts = <101 2 0 0>;
+};
+
+Example for FMan v3 internal MDIO:
+
+mdio@f1000 {
+        compatible = "fsl,fman-memac-mdio";
+        reg = <0xf1000 0x1000>;
+        fsl,fman-internal-mdio;
+};
+
+=============================================================================
 Example
 
 fman@400000 {
@@ -531,4 +595,10 @@ fman@400000 {
                 compatible = "fsl,fman-ptp-timer";
                 reg = <0xfe000 0x1000>;
         };
+
+        mdio@f1000 {
+                compatible = "fsl,fman-xmdio";
+                reg = <0xf1000 0x1000>;
+                interrupts = <101 2 0 0>;
+        };
 };
diff --git a/Documentation/devicetree/bindings/soc/fsl/bman.txt b/Documentation/devicetree/bindings/soc/fsl/bman.txt
index 9f80bf8709ac..47ac834414d8 100644
--- a/Documentation/devicetree/bindings/soc/fsl/bman.txt
+++ b/Documentation/devicetree/bindings/soc/fsl/bman.txt
@@ -36,6 +36,11 @@ are located at offsets 0xbf8 and 0xbfc
         Value type:     <prop-encoded-array>
         Definition:     Standard property. The error interrupt
 
+- fsl,bman-portals
+        Usage:          Required
+        Value type:     <phandle>
+        Definition:     Phandle to this BMan instance's portals
+
 - fsl,liodn
         Usage:          See pamu.txt
         Value type:     <prop-encoded-array>
@@ -96,7 +101,7 @@ The example below shows a BMan FBPR dynamic allocation memory node
 
                 bman_fbpr: bman-fbpr {
                         compatible = "fsl,bman-fbpr";
-                        alloc-ranges = <0 0 0xf 0xffffffff>;
+                        alloc-ranges = <0 0 0x10 0>;
                         size = <0 0x1000000>;
                         alignment = <0 0x1000000>;
                 };
@@ -104,6 +109,10 @@ The example below shows a BMan FBPR dynamic allocation memory node