---

yaml --- r: 344289 b: refs/heads/master c: c896ed0 h: refs/heads/master i: 344287: e641b66 v: v3
git-mirror · Nov 20, 2012 · 3eb89ac · 3eb89ac
1 parent fa452a1
commit 3eb89ac
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 3,480 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9dc03ddbf4e71f20b78277d661388c1bc466258
+refs/heads/master: c896ed0fd72505104db3e78fffe3d8c604d25277
diff --git a/trunk/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/trunk/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt b/trunk/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -4749,12 +4749,6 @@ S:	Maintained
 F:	drivers/net/ethernet/marvell/mv643xx_eth.*
 F:	include/linux/mv643xx.h
 
-MARVELL MVNETA ETHERNET DRIVER
-M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-L:	netdev@vger.kernel.org
-S:	Maintained
-F:	drivers/net/ethernet/marvell/mvneta.*
-
 MARVELL MWIFIEX WIRELESS DRIVER
 M:	Bing Zhao <bzhao@marvell.com>
 L:	linux-wireless@vger.kernel.org

diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile
@@ -44,9 +44,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
 dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 	msm8960-cdp.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
-	armada-370-mirabox.dtb \
-	armada-xp-db.dtb \
-	armada-xp-openblocks-ax3-4.dtb
+	armada-xp-db.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
 	imx53-ard.dtb \
 	imx53-evk.dtb \

diff --git a/trunk/arch/arm/boot/dts/armada-370-db.dts b/trunk/arch/arm/boot/dts/armada-370-db.dts
@@ -34,30 +34,5 @@
 			clock-frequency = <200000000>;
 			status = "okay";
 		};
-		sata@d00a0000 {
-			nr-ports = <2>;
-			status = "okay";
-		};
-
-		mdio {
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-			};
-
-			phy1: ethernet-phy@1 {
-				reg = <1>;
-			};
-		};
-
-		ethernet@d0070000 {
-			status = "okay";
-			phy = <&phy0>;
-			phy-mode = "rgmii-id";
-		};
-		ethernet@d0074000 {
-			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
diff --git a/trunk/arch/arm/boot/dts/armada-370-xp.dtsi b/trunk/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -69,38 +69,6 @@
 			compatible = "marvell,armada-addr-decoding-controller";
 			reg = <0xd0020000 0x258>;
 		};
-
-		sata@d00a0000 {
-			compatible = "marvell,orion-sata";
-			reg = <0xd00a0000 0x2400>;
-			interrupts = <55>;
-			clocks = <&gateclk 15>, <&gateclk 30>;
-			clock-names = "0", "1";
-			status = "disabled";
-		};
-
-		mdio {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "marvell,orion-mdio";
-			reg = <0xd0072004 0x4>;
-		};
-
-		ethernet@d0070000 {
-				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
@@ -46,48 +46,5 @@
 			clock-frequency = <250000000>;
 			status = "okay";
 		};
-		sata@d00a0000 {
-			nr-ports = <2>;
-			status = "okay";
-		};
-
-		mdio {
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-			};
-
-			phy1: ethernet-phy@1 {
-				reg = <1>;
-			};
-
-			phy2: ethernet-phy@2 {
-				reg = <25>;
-			};
-
-			phy3: ethernet-phy@3 {
-				reg = <27>;
-			};
-		};
-
-		ethernet@d0070000 {
-			status = "okay";
-			phy = <&phy0>;
-			phy-mode = "rgmii-id";
-		};
-		ethernet@d0074000 {
-			status = "okay";
-			phy = <&phy1>;
-			phy-mode = "rgmii-id";
-		};
-		ethernet@d0030000 {
-			status = "okay";
-			phy = <&phy2>;
-			phy-mode = "sgmii";
-		};
-		ethernet@d0034000 {
-			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
diff --git a/trunk/arch/arm/boot/dts/armada-xp.dtsi b/trunk/arch/arm/boot/dts/armada-xp.dtsi
@@ -71,21 +71,5 @@
 				compatible = "marvell,armada-370-xp-system-controller";
 				reg = <0xd0018200 0x500>;
 		};
-
-		ethernet@d0030000 {
-				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";
-		};
 	};
 };