Skip to contentSkip to conversation

FAILED: patch "[PATCH] ARM: mvebu: update Ethernet compatible string for Armada XP" failed to apply to 4.1-stable tree

PATCH [email protected] 1 participant 1 message Jul 30, 2015

Subsystems (2)
Stable branch Device tree bindings
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From ea3b55fe83b5fcede82d183164b9d6831b26e33b Mon Sep 17 00:00:00 2001

From: Simon Guinot <[email protected]>
Date: Tue, 30 Jun 2015 16:20:21 +0200
Subject: [PATCH] ARM: mvebu: update Ethernet compatible string for Armada XP

This patch updates the Ethernet DT nodes for Armada XP SoCs with the compatible string "marvell,armada-xp-neta".

Signed-off-by Simon Guinot <[email protected]>
Fixes 77916519cba3 ("arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces")
Cc <[email protected]> # v3.8+
Acked-by Gregory CLEMENT <[email protected]>
Reviewed-by Thomas Petazzoni <[email protected]>
Signed-off-by David S. Miller <[email protected]>
arch/arm/boot/dts/armada-370-xp.dtsi +0 -2
index ec96f0b36346..06a2f2ae9d1e 100644
@@ -270,7 +270,6 @@
 			};
 
 			eth0: ethernet@70000 {
-				compatible = "marvell,armada-370-neta";
 				reg = <0x70000 0x4000>;
 				interrupts = <8>;
 				clocks = <&gateclk 4>;

@@ -286,7 +285,6 @@
 			};
 
 			eth1: ethernet@74000 {
-				compatible = "marvell,armada-370-neta";
 				reg = <0x74000 0x4000>;
 				interrupts = <10>;
 				clocks = <&gateclk 3>;
arch/arm/boot/dts/armada-370.dtsi +8 -0
index 00b50db57c9c..ca4257b2f77d 100644
@@ -307,6 +307,14 @@
 					dmacap,memset;
 				};
 			};
+
+			ethernet@70000 {
+				compatible = "marvell,armada-370-neta";
+			};
+
+			ethernet@74000 {
+				compatible = "marvell,armada-370-neta";
+			};
 		};
 	};
 };
arch/arm/boot/dts/armada-xp-mv78260.dtsi +1 -1
index 8479fdc9e9c2..c5fdc99f0dbe 100644
@@ -318,7 +318,7 @@
 			};
 
 			eth3: ethernet@34000 {
-				compatible = "marvell,armada-370-neta";
+				compatible = "marvell,armada-xp-neta";
 				reg = <0x34000 0x4000>;
 				interrupts = <14>;
 				clocks = <&gateclk 1>;
arch/arm/boot/dts/armada-xp-mv78460.dtsi +1 -1
index 661d54c81580..0e24f1a38540 100644
@@ -356,7 +356,7 @@
 			};
 
 			eth3: ethernet@34000 {
-				compatible = "marvell,armada-370-neta";
+				compatible = "marvell,armada-xp-neta";
 				reg = <0x34000 0x4000>;
 				interrupts = <14>;
 				clocks = <&gateclk 1>;
arch/arm/boot/dts/armada-xp.dtsi +9 -1
index 013d63f69e36..8fdd6d7c0ab1 100644
@@ -177,7 +177,7 @@
 			};
 
 			eth2: ethernet@30000 {
-				compatible = "marvell,armada-370-neta";
+				compatible = "marvell,armada-xp-neta";
 				reg = <0x30000 0x4000>;
 				interrupts = <12>;
 				clocks = <&gateclk 2>;

@@ -220,6 +220,14 @@
 				};
 			};
 
+			ethernet@70000 {
+				compatible = "marvell,armada-xp-neta";
+			};
+
+			ethernet@74000 {
+				compatible = "marvell,armada-xp-neta";
+			};
+
 			xor@f0900 {
 				compatible = "marvell,orion-xor";
 				reg = <0xF0900 0x100