---

yaml --- r: 344313 b: refs/heads/master c: f40788a h: refs/heads/master i: 344311: 721725e v: v3
git-mirror · Nov 20, 2012 · b35eb76 · b35eb76
1 parent 2161678
commit b35eb76
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -90,13 +90,15 @@
 				compatible = "marvell,armada-370-neta";
 				reg = <0xd0070000 0x2500>;
 				interrupts = <8>;
+				clocks = <&gateclk 4>;
 				status = "disabled";
 		};
 
 		ethernet@d0074000 {
 				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
@@ -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
@@ -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
@@ -76,13 +76,15 @@
 				compatible = "marvell,armada-370-neta";
 				reg = <0xd0030000 0x2500>;
 				interrupts = <12>;
+				clocks = <&gateclk 2>;
 				status = "disabled";
 		};
 
 		ethernet@d0034000 {
 				compatible = "marvell,armada-370-neta";
 				reg = <0xd0034000 0x2500>;
 				interrupts = <14>;
+				clocks = <&gateclk 1>;
 				status = "disabled";
 		};
 	};