15 files changed, 2404 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/net/apm-xgene-enet.txt b/Documentation/devicetree/bindings/net/apm-xgene-enet.txt
new file mode 100644
index 000000000000..ebcad25efd0a
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/apm-xgene-enet.txt
@@ -0,0 +1,66 @@
+APM X-Gene SoC Ethernet nodes
+
+Ethernet nodes are defined to describe on-chip ethernet interfaces in
+APM X-Gene SoC.
+
+Required properties:
+- compatible: Should be "apm,xgene-enet"
+- reg: Address and length of the register set for the device. It contains the
+  information of registers in the same order as described by reg-names
+- reg-names: Should contain the register set names
+  - "enet_csr": Ethernet control and status register address space
+  - "ring_csr": Descriptor ring control and status register address space
+  - "ring_cmd": Descriptor ring command register address space
+- interrupts: Ethernet main interrupt
+- clocks: Reference to the clock entry.
+- local-mac-address: MAC address assigned to this device
+- phy-connection-type: Interface type between ethernet device and PHY device
+- phy-handle: Reference to a PHY node connected to this device
+
+- mdio: Device tree subnode with the following required properties:
+  - compatible: Must be "apm,xgene-mdio".
+  - #address-cells: Must be <1>.
+  - #size-cells: Must be <0>.
+
+  For the phy on the mdio bus, there must be a node with the following fields:
+  - compatible: PHY identifier.  Please refer ./phy.txt for the format.
+  - reg: The ID number for the phy.
+
+Optional properties:
+- status: Should be "ok" or "disabled" for enabled/disabled. Default is "ok".
+
+Example:
+        menetclk: menetclk {
+                compatible = "apm,xgene-device-clock";
+                clock-output-names = "menetclk";
+                status = "ok";
+        };
+
+        menet: ethernet@17020000 {
+                compatible = "apm,xgene-enet";
+                status = "disabled";
+                reg = <0x0 0x17020000 0x0 0xd100>,
+                      <0x0 0X17030000 0x0 0X400>,
+                      <0x0 0X10000000 0x0 0X200>;
+                reg-names = "enet_csr", "ring_csr", "ring_cmd";
+                interrupts = <0x0 0x3c 0x4>;
+                clocks = <&menetclk 0>;
+                local-mac-address = [00 01 73 00 00 01];
+                phy-connection-type = "rgmii";
+                phy-handle = <&menetphy>;
+                mdio {
+                        compatible = "apm,xgene-mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        menetphy: menetphy@3 {
+                                compatible = "ethernet-phy-id001c.c915";
+                                reg = <0x3>;
+                        };
+
+                };
+        };
+
+/* Board-specific peripheral configurations */
+&menet {
+        status = "ok";
+};
diff --git a/MAINTAINERS b/MAINTAINERS
index 05e545096100..e8ac35270823 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -719,6 +719,14 @@ S:	Maintained
 F:      drivers/net/appletalk/
 F:      net/appletalk/
 
+APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
+M:      Iyappan Subramanian <isubramanian@apm.com>
+M:      Keyur Chudgar <kchudgar@apm.com>
+M:      Ravi Patel <rapatel@apm.com>
+S:      Supported
+F:      drivers/net/ethernet/apm/xgene/
+F:      Documentation/devicetree/bindings/net/apm-xgene-enet.txt
+
 APTINA CAMERA SENSOR PLL
 M:      Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 L:      linux-media@vger.kernel.org
diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
index 6541962f5d70..b2f56229aa5e 100644
--- a/arch/arm64/boot/dts/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm-mustang.dts
@@ -28,3 +28,7 @@
 &serial0 {
         status = "ok";
 };
+
+&menet {
+        status = "ok";
+};
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index 40aa96ce13c4..c0aceef7f5b3 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -167,14 +167,13 @@
                                 clock-output-names = "ethclk";
                         };
 
-                        eth8clk: eth8clk {
+                        menetclk: menetclk {
                                 compatible = "apm,xgene-device-clock";
                                 #clock-cells = <1>;
                                 clocks = <&ethclk 0>;
-                                clock-names = "eth8clk";
                                 reg = <0x0 0x1702C000 0x0 0x1000>;
                                 reg-names = "csr-reg";
-                                clock-output-names = "eth8clk";
+                                clock-output-names = "menetclk";
                         };
 
                         sataphy1clk: sataphy1clk@1f21c000 {
@@ -397,5 +396,30 @@
                         #clock-cells = <1>;
                         clocks = <&rtcclk 0>;
                 };
+
+                menet: ethernet@17020000 {
+                        compatible = "apm,xgene-enet";
+                        status = "disabled";
+                        reg = <0x0 0x17020000 0x0 0xd100>,
+                              <0x0 0X17030000 0x0 0X400>,
+                              <0x0 0X10000000 0x0 0X200>;
+                        reg-names = "enet_csr", "ring_csr", "ring_cmd";
+                        interrupts = <0x0 0x3c 0x4>;
+                        dma-coherent;
+                        clocks = <&menetclk 0>;
+                        local-mac-address = [00 01 73 00 00 01];
+                        phy-connection-type = "rgmii";
+                        phy-handle = <&menetphy>;
+                        mdio {
+                                compatible = "apm,xgene-mdio";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                menetphy: menetphy@3 {
+                                        compatible = "ethernet-phy-id001c.c915";
+                                        reg = <0x3>;
+                                };
+
+                        };
+                };
         };
 };
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index edb718661850..dc7406c81c45 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -24,6 +24,7 @@ source "drivers/net/ethernet/allwinner/Kconfig"
 source "drivers/net/ethernet/alteon/Kconfig"
 source "drivers/net/ethernet/altera/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
+source "drivers/net/ethernet/apm/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
 source "drivers/net/ethernet/arc/Kconfig"