From b35eb76f0b421a65cd77a04cbdfed41e7038cf6a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Nov 2012 23:38:00 +0100
Subject: [PATCH] --- yaml --- r: 344313 b: refs/heads/master c:
 f40788a6663267fc985a5871034f2638002f5bd6 h: refs/heads/master i:   344311:
 721725e50ca4a56e1d50b07d2c7409a4fc5f72b6 v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/arm/boot/dts/armada-370-db.dts              | 2 --
 trunk/arch/arm/boot/dts/armada-370-mirabox.dts         | 2 --
 trunk/arch/arm/boot/dts/armada-370-xp.dtsi             | 2 ++
 trunk/arch/arm/boot/dts/armada-xp-db.dts               | 4 ----
 trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ----
 trunk/arch/arm/boot/dts/armada-xp.dtsi                 | 2 ++
 7 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index b53ace04b4c1..09043cfcd371 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a19aab5792e907175a0515388e3de4f27d107b9e
+refs/heads/master: f40788a6663267fc985a5871034f2638002f5bd6
diff --git a/trunk/arch/arm/boot/dts/armada-370-db.dts b/trunk/arch/arm/boot/dts/armada-370-db.dts
index 63120569878a..00044026ef1f 100644
--- a/trunk/arch/arm/boot/dts/armada-370-db.dts
+++ b/trunk/arch/arm/boot/dts/armada-370-db.dts
@@ -50,13 +50,11 @@
 		};
 
 		ethernet@d0070000 {
-			clock-frequency = <200000000>;
 			status = "okay";
 			phy = <&phy0>;
 			phy-mode = "rgmii-id";
 		};
 		ethernet@d0074000 {
-			clock-frequency = <200000000>;
 			status = "okay";
 			phy = <&phy1>;
 			phy-mode = "rgmii-id";
diff --git a/trunk/arch/arm/boot/dts/armada-370-mirabox.dts b/trunk/arch/arm/boot/dts/armada-370-mirabox.dts
index 8554dbee2640..3b4071336599 100644
--- a/trunk/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/trunk/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -43,13 +43,11 @@
 			};
 		};
 		ethernet@d0070000 {
-			clock-frequency = <200000000>;
 			status = "okay";
 			phy = <&phy0>;
 			phy-mode = "rgmii-id";
 		};
 		ethernet@d0074000 {
-			clock-frequency = <200000000>;
 			status = "okay";
 			phy = <&phy1>;
 			phy-mode = "rgmii-id";
diff --git a/trunk/arch/arm/boot/dts/armada-370-xp.dtsi b/trunk/arch/arm/boot/dts/armada-370-xp.dtsi
index 4c248e30fcb3..4ff108151278 100644
--- a/trunk/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/trunk/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -90,6 +90,7 @@
 				compatible = "marvell,armada-370-neta";
 				reg = <0xd0070000 0x2500>;
 				interrupts = <8>;
+				clocks = <&gateclk 4>;
 				status = "disabled";
 		};
 
@@ -97,6 +98,7 @@
 				compatible = "marvell,armada-370-neta";
 				reg = <0xd0074000 0x2500>;
 				interrupts = <10>;
+				clocks = <&gateclk 3>;
 				status = "disabled";
 		};
 	};
diff --git a/trunk/arch/arm/boot/dts/armada-xp-db.dts b/trunk/arch/arm/boot/dts/armada-xp-db.dts
index 2673ac7a0fbe..8e53b25b5508 100644
--- a/trunk/arch/arm/boot/dts/armada-xp-db.dts
+++ b/trunk/arch/arm/boot/dts/armada-xp-db.dts
@@ -71,25 +71,21 @@
 		};
 
 		ethernet@d0070000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy0>;
 			phy-mode = "rgmii-id";
 		};
 		ethernet@d0074000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy1>;
 			phy-mode = "rgmii-id";
 		};
 		ethernet@d0030000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy2>;
 			phy-mode = "sgmii";
 		};
 		ethernet@d0034000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy3>;
 			phy-mode = "sgmii";
diff --git a/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index bb8d83cfbb50..638fb68d47b2 100644
--- a/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/trunk/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -85,25 +85,21 @@
 		};
 
 		ethernet@d0070000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy0>;
 			phy-mode = "sgmii";
 		};
 		ethernet@d0074000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy1>;
 			phy-mode = "sgmii";
 		};
 		ethernet@d0030000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy2>;
 			phy-mode = "sgmii";
 		};
 		ethernet@d0034000 {
-			clock-frequency = <250000000>;
 			status = "okay";
 			phy = <&phy3>;
 			phy-mode = "sgmii";
diff --git a/trunk/arch/arm/boot/dts/armada-xp.dtsi b/trunk/arch/arm/boot/dts/armada-xp.dtsi
index fbe30f5e98a8..3744ea18be72 100644
--- a/trunk/arch/arm/boot/dts/armada-xp.dtsi
+++ b/trunk/arch/arm/boot/dts/armada-xp.dtsi
@@ -76,6 +76,7 @@
 				compatible = "marvell,armada-370-neta";
 				reg = <0xd0030000 0x2500>;
 				interrupts = <12>;
+				clocks = <&gateclk 2>;
 				status = "disabled";
 		};
 
@@ -83,6 +84,7 @@
 				compatible = "marvell,armada-370-neta";
 				reg = <0xd0034000 0x2500>;
 				interrupts = <14>;
+				clocks = <&gateclk 1>;
 				status = "disabled";
 		};
 	};