Skip to contentSkip to conversation

Patch "ARM: mvebu: update Ethernet compatible string for Armada XP" has been added to the 4.0-stable tree

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

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

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: mvebu: update Ethernet compatible string for Armada XP

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-mvebu-update-ethernet-compatible-string-for-armada-xp.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Jul 3 19:59:52 PDT 2015

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

From: Simon Guinot <[email protected]>

[ Upstream commit ea3b55fe83b5fcede82d183164b9d6831b26e33b ]

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]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/arm/boot/dts/armada-370-xp.dtsi     |    2 --
 arch/arm/boot/dts/armada-370.dtsi        |    8 ++++++++
 arch/arm/boot/dts/armada-xp-mv78260.dtsi |    2 +-
 arch/arm/boot/dts/armada-xp-mv78460.dtsi |    2 +-
 arch/arm/boot/dts/armada-xp.dtsi         |   10 +++++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)
arch/arm/boot/dts/armada-370-xp.dtsi +0 -2
@@ -265,7 +265,6 @@
 			};
 
 			eth0: ethernet@70000 {
-				compatible = "marvell,armada-370-neta";
 				reg = <0x70000 0x4000>;
 				interrupts = <8>;
 				clocks = <&gateclk 4>;

@@ -281,7 +280,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
@@ -306,6 +306,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
@@ -319,7 +319,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
@@ -357,7 +357,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
@@ -175,7 +175,7 @@
 			};
 
 			eth2: ethernet@30000 {
-				compatible = "marvell,armada-370-neta";
+				compatible = "marvell,armada-xp-neta";
 				reg = <0x30000 0x4000>;
 				interrupts = <12>;
 				clocks = <&gateclk 2>;

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

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/arm-mvebu-update-ethernet-compatible-string-for-armada-xp.patch queue-4.0/net-mvneta-disable-ip-checksum-with-jumbo-frames-for-armada-370.patch queue-4.0/net-mvneta-introduce-compatible-string-marvell-armada-xp-neta.patch