---

yaml
---
r: 344297
b: refs/heads/master
c: 009f131
h: refs/heads/master
i:
  344295: ab8d91a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a
+refs/heads/master: 009f13159bfdccd6e06fe3b62a39fee6dce26c39

trunk/Documentation/devicetree/bindings/arm/coherency-fabric.txt

@@ -0,0 +1,16 @@
+Coherency fabric
+----------------
+Available on Marvell SOCs: Armada 370 and Armada XP
+
+Required properties:
+
+- compatible: "marvell,coherency-fabric"
+- reg: Should contain,coherency fabric registers location and length.
+
+Example:
+
+coherency-fabric@d0020200 {
+	compatible = "marvell,coherency-fabric";
+	reg = <0xd0020200 0xb0>;
+};
+

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

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 \

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";
-		};
 	};
 };

trunk/arch/arm/boot/dts/armada-370-xp.dtsi

@@ -36,6 +36,11 @@
 	      interrupt-controller;
 	};
 
+	coherency-fabric@d0020200 {
+		compatible = "marvell,coherency-fabric";
+		reg = <0xd0020200 0xb0>;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -69,38 +74,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";
-		};
 	};
 };
 

trunk/arch/arm/boot/dts/armada-370.dtsi

@@ -89,42 +89,6 @@
 			#clock-cells = <1>;
 		};
 
-		xor@d0060800 {
-			compatible = "marvell,orion-xor";
-			reg = <0xd0060800 0x100
-			       0xd0060A00 0x100>;
-			status = "okay";
 
-			xor00 {
-				interrupts = <51>;
-				dmacap,memcpy;
-				dmacap,xor;
-			};
-			xor01 {
-				interrupts = <52>;
-				dmacap,memcpy;
-				dmacap,xor;
-				dmacap,memset;
-			};
-		};
-
-		xor@d0060900 {
-			compatible = "marvell,orion-xor";
-			reg = <0xd0060900 0x100
-			       0xd0060b00 0x100>;
-			status = "okay";
-
-			xor10 {
-				interrupts = <94>;
-				dmacap,memcpy;
-				dmacap,xor;
-			};
-			xor11 {
-				interrupts = <95>;
-				dmacap,memcpy;
-				dmacap,xor;
-				dmacap,memset;
-			};
-		};
 	};
 };

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";
-		};
 	};
 };