Merge branch 'net/next' into next

* net/next: (257 commits)
  dpaa2-switch: remove the double rtnl locks
  dpaa2-mac: only issue phylink_stop/start if necessary
  dpaa2-switch: detach the dpaa2_mac driver before configuring the PHY
  dpaa2-mac: disconnect before the close operation
  dpaa2-mac: take into account a defer probe request
  ...

3 files changed, 224 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
index b0933a8c295a..953562d89c89 100644
--- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@ -32,6 +32,15 @@ properties:
       - minItems: 6
         maxItems: 6
 
+  nvmem-mac-address:
+    allOf:
+      - $ref: /schemas/types.yaml#definitions/uint8-array
+      - minItems: 6
+        maxItems: 6
+    description:
+      Specifies the MAC address that was read from nvmem-cells and dynamically
+      add the property in device node;
+
   max-frame-size:
     $ref: /schemas/types.yaml#/definitions/uint32
     description:
@@ -52,6 +61,11 @@ properties:
   nvmem-cell-names:
     const: mac-address
 
+  nvmem_macaddr_swap:
+    $ref: /schemas/types.yaml#/definitions/flag
+    description:
+      swap bytes order for the 6 bytes of MAC address
+
   phy-connection-type:
     description:
       Specifies interface type between the Ethernet device and a physical
diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml b/Documentation/devicetree/bindings/net/fsl,fec.yaml
index eca41443fcce..fa6f070e87f1 100644
--- a/Documentation/devicetree/bindings/net/fsl,fec.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -164,6 +164,17 @@ properties:
       req_gpr is the gpr register offset for ENET stop request.
       req_bit is the gpr bit offset for ENET stop request.
 
+  fsl,wakeup_irq:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      The property defines the wakeup irq index in enet irq source.
+
+  mii-exclusive:
+    $ref: /schemas/types.yaml#/definitions/flag
+    description:
+      If present, each MAC has their exclusive MDIO bus in current board
+      design, otherwise multiple MACs share one MDIO bus to reduce Pins utilize.
+
   mdio:
     type: object
     description:
diff --git a/Documentation/devicetree/bindings/net/fsl_ppfe/pfe.txt b/Documentation/devicetree/bindings/net/fsl_ppfe/pfe.txt
new file mode 100644
index 000000000000..4b38312c9b7f
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/fsl_ppfe/pfe.txt
@@ -0,0 +1,199 @@
+=============================================================================
+NXP Programmable Packet Forwarding Engine Device Bindings
+
+CONTENTS
+  - PFE Node
+  - Ethernet Node
+
+=============================================================================
+PFE Node
+
+DESCRIPTION
+
+PFE Node has all the properties associated with Packet Forwarding Engine block.
+
+PROPERTIES
+
+- compatible
+		Usage: required
+		Value type: <stringlist>
+		Definition: Must include "fsl,pfe"
+
+- reg
+		Usage: required
+		Value type: <prop-encoded-array>
+		Definition: A standard property.
+		Specifies the offset of the following registers:
+		- PFE configuration registers
+		- DDR memory used by PFE
+
+- fsl,pfe-num-interfaces
+		Usage: required
+		Value type: <u32>
+		Definition: Must be present. Value can be either one or two.
+
+- interrupts
+		Usage: required
+		Value type: <prop-encoded-array>
+		Definition: Three interrupts are specified in this property.
+		- HIF interrupt
+		- HIF NO COPY interrupt
+		- Wake On LAN interrupt
+
+- interrupt-names
+		Usage: required
+		Value type: <stringlist>
+		Definition: Following strings are defined for the 3 interrupts.
+		"pfe_hif" - HIF interrupt
+		"pfe_hif_nocpy" - HIF NO COPY interrupt
+		"pfe_wol" - Wake On LAN interrupt
+
+- memory-region
+		Usage: required
+		Value type: <phandle>
+		Definition: phandle to a node describing reserved memory used by pfe.
+		Refer:- Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt
+
+- fsl,pfe-scfg
+		Usage: required
+		Value type: <phandle>
+		Definition: phandle for scfg.
+
+- fsl,rcpm-wakeup
+		Usage: required
+		Value type: <phandle>
+		Definition: phandle for rcpm.
+
+- clocks
+		Usage: required
+		Value type: <phandle>
+		Definition: phandle for clockgen.
+
+- clock-names
+		Usage: required
+		Value type: <string>
+		Definition: phandle for clock name.
+
+EXAMPLE
+
+pfe: pfe@04000000 {
+	compatible = "fsl,pfe";
+	reg =   <0x0 0x04000000 0x0 0xc00000>,	/* AXI 16M */
+		<0x0 0x83400000 0x0 0xc00000>;  /* PFE DDR 12M */
+	reg-names = "pfe", "pfe-ddr";
+	fsl,pfe-num-interfaces = <0x2>;
+	interrupts = <0 172 0x4>,    /* HIF interrupt */
+		     <0 173 0x4>,    /*HIF_NOCPY interrupt */
+		     <0 174 0x4>;    /* WoL interrupt */
+	interrupt-names = "pfe_hif", "pfe_hif_nocpy", "pfe_wol";
+	memory-region = <&pfe_reserved>;
+	fsl,pfe-scfg = <&scfg 0>;
+	fsl,rcpm-wakeup = <&rcpm 0xf0000020>;
+	clocks = <&clockgen 4 0>;
+	clock-names = "pfe";
+
+	status = "okay";
+	pfe_mac0: ethernet@0 {
+	};
+
+	pfe_mac1: ethernet@1 {
+	};
+};
+
+=============================================================================
+Ethernet Node
+
+DESCRIPTION
+
+Ethernet Node has all the properties associated with PFE used by platforms to
+connect to PHY:
+
+PROPERTIES
+
+- compatible
+		Usage: required
+		Value type: <stringlist>
+		Definition: Must include "fsl,pfe-gemac-port"
+
+- reg
+		Usage: required
+		Value type: <prop-encoded-array>
+		Definition: A standard property.
+		Specifies the gemacid of the interface.
+
+- fsl,gemac-bus-id
+		Usage: required
+		Value type: <u32>
+		Definition: Must be present. Value should be the id of the bus
+		connected to gemac.
+
+- fsl,gemac-phy-id (deprecated binding)
+               Usage: required
+               Value type: <u32>
+               Definition: This binding shouldn't be used with new platforms.
+	       Must be present. Value should be the id of the phy
+               connected to gemac.
+
+- fsl,mdio-mux-val
+		Usage: required
+		Value type: <u32>
+		Definition: Must be present. Value can be either 0 or 2 or 3.
+		This value is used to configure the mux to enable mdio.
+
+- phy-mode
+		Usage: required
+		Value type: <string>
+		Definition: Must include "sgmii"
+
+- fsl,pfe-phy-if-flags (deprecated binding)
+               Usage: required
+               Value type: <u32>
+               Definition: This binding shouldn't be used with new platforms.
+               Must be present. Value should be 0 by default.
+               If there is not phy connected, this need to be 1.
+
+- phy-handle
+		Usage: optional
+		Value type: <phandle>
+		Definition: phandle to the PHY device connected to this device.
+
+- mdio : A required subnode which specifies the mdio bus in the PFE and used as
+a container for phy nodes according to ../phy.txt.
+
+EXAMPLE
+
+ethernet@0 {
+	compatible = "fsl,pfe-gemac-port";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x0>;	/* GEM_ID */
+	fsl,gemac-bus-id = <0x0>;	/* BUS_ID */
+	fsl,mdio-mux-val = <0x0>;
+	phy-mode = "sgmii";
+	phy-handle = <&sgmii_phy1>;
+};
+
+
+ethernet@1 {
+	compatible = "fsl,pfe-gemac-port";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x1>;	/* GEM_ID */
+	fsl,gemac-bus-id = <0x1>;	/* BUS_ID */
+	fsl,mdio-mux-val = <0x0>;
+	phy-mode = "sgmii";
+	phy-handle = <&sgmii_phy2>;
+};
+
+mdio@0 {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	sgmii_phy1: ethernet-phy@2 {
+		reg = <0x2>;
+	};
+
+	sgmii_phy2: ethernet-phy@1 {
+		reg = <0x1>;
+	};
+};