[PATCH 7/7] [trusty SRU] (upstream) dtb: xgene: Add second SGMII based 1G interface node

[Craig Magina]

From: Keyur Chudgar <kchudgar at apm.com>

- Added new SGMII node for port 1
- Added port-id field

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1458042

Signed-off-by: Keyur Chudgar <kchudgar at apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian at apm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 2d33394e23d63b750dcba40e5feaeba425427b52)
Signed-off-by: Phong Vo <pvo at apm.com>
Signed-off-by: Craig Magina <craig.magina at canonical.com>

Conflicts:
	arch/arm64/boot/dts/apm/apm-mustang.dts
	arch/arm64/boot/dts/apm/apm-storm.dtsi
---
 arch/arm64/boot/dts/apm-mustang.dts |  4 ++++
 arch/arm64/boot/dts/apm-storm.dtsi  | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
index 47095d0..84b9c65 100644
--- a/arch/arm64/boot/dts/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm-mustang.dts
@@ -41,6 +41,10 @@
 	status = "ok";
 };
 
+&sgenet1 {
+	status = "ok";
+};
+
 &xgenet {
 	status = "ok";
 };
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index 5807101..e75cdd9 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -196,6 +196,16 @@
 				clock-output-names = "sge0clk";
 			};
 
+			sge1clk: sge1clk at 1f21c000 {
+				compatible = "apm,xgene-device-clock";
+				#clock-cells = <1>;
+				clocks = <&socplldiv2 0>;
+				reg = <0x0 0x1f21c000 0x0 0x1000>;
+				reg-names = "csr-reg";
+				csr-mask = <0xc>;
+				clock-output-names = "sge1clk";
+			};
+
 			xge0clk: xge0clk at 1f61c000 {
 				compatible = "apm,xgene-device-clock";
 				#clock-cells = <1>;
@@ -655,6 +665,22 @@
 			phy-connection-type = "sgmii";
 		};
 
+		sgenet1: ethernet at 1f210030 {
+			compatible = "apm,xgene1-sgenet";
+			status = "disabled";
+			reg = <0x0 0x1f210030 0x0 0xd100>,
+			      <0x0 0x1f200000 0x0 0Xc300>,
+			      <0x0 0x1B000000 0x0 0X8000>;
+			reg-names = "enet_csr", "ring_csr", "ring_cmd";
+			interrupts = <0x0 0xAC 0x4>,
+				     <0x0 0xAD 0x4>;
+			port-id = <1>;
+			dma-coherent;
+			clocks = <&sge1clk 0>;
+			local-mac-address = [00 00 00 00 00 00];
+			phy-connection-type = "sgmii";
+		};
+
 		xgenet: ethernet at 1f610000 {
 			compatible = "apm,xgene1-xgenet";
 			status = "disabled";
-- 
2.1.4