Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f4ef975 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mvneta-jumbo-frames' 



Simon Guinot says:

====================
Fix Ethernet jumbo frames support for Armada 370 and 38x

This patch series fixes the Ethernet jumbo frames support for the SoCs
Armada 370, 380 and 385. Unlike Armada XP, the Ethernet controller for
this SoCs don't support TCP/IP checksumming with a frame size larger
than 1600 bytes.

This patches should be applied to the -stable kernels 3.8 and onwards.

Changes since v1:
- Use a new compatible string for the Ethernet IP found in Armada XP
  SoCs (instead of using an optional property).
- Fix the issue for the Armada 380 and 385 SoCs as well.

Changes since v2:
- Add Acked-by from Gregory Clement.
- Add "Fixes:" tag to each commits.

Changes since v3:
- Fix patch 3 name: replace prefix "ARM: mvebu:" with "net: mvneta:".
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 279c6c7f b65657fc

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+1 −1
Original line number Original line Diff line number Diff line 
* Marvell Armada 370 / Armada XP Ethernet Controller (NETA)

* Marvell Armada 370 / Armada XP Ethernet Controller (NETA)





Required properties:

Required properties:

- compatible: should be "marvell,armada-370-neta".

- compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta".

- reg: address and length of the register set for the device.

- reg: address and length of the register set for the device.

- interrupts: interrupt for the device

- interrupts: interrupt for the device

- phy: See ethernet.txt file in the same directory.

- phy: See ethernet.txt file in the same directory.

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -270,7 +270,6 @@ 
			};

			};





			eth0: ethernet@70000 {

			eth0: ethernet@70000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x70000 0x4000>;

				reg = <0x70000 0x4000>;

				interrupts = <8>;

				interrupts = <8>;

				clocks = <&gateclk 4>;

				clocks = <&gateclk 4>;
@@ -286,7 +285,6 @@ 
			};

			};





			eth1: ethernet@74000 {

			eth1: ethernet@74000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x74000 0x4000>;

				reg = <0x74000 0x4000>;

				interrupts = <10>;

				interrupts = <10>;

				clocks = <&gateclk 3>;

				clocks = <&gateclk 3>;

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -307,6 +307,14 @@ 
					dmacap,memset;

					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
Original line number Original line Diff line number Diff line
@@ -318,7 +318,7 @@ 
			};

			};





			eth3: ethernet@34000 {

			eth3: ethernet@34000 {

				compatible = "marvell,armada-370-neta";

				compatible = "marvell,armada-xp-neta";

				reg = <0x34000 0x4000>;

				reg = <0x34000 0x4000>;

				interrupts = <14>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

				clocks = <&gateclk 1>;

arch/arm/boot/dts/armada-xp-mv78460.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -356,7 +356,7 @@ 
			};

			};





			eth3: ethernet@34000 {

			eth3: ethernet@34000 {

				compatible = "marvell,armada-370-neta";

				compatible = "marvell,armada-xp-neta";

				reg = <0x34000 0x4000>;

				reg = <0x34000 0x4000>;

				interrupts = <14>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

				clocks = <&gateclk 1>;