[linux] 01/01: [armhf] Add support for switch hardware on Turris Omnia

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

ukleinek pushed a commit to branch master
in repository linux.

commit a3e600085e9ab57b11df72c4092f31d8457157d9
Author: Uwe Kleine-König <ukleinek at debian.org>
Date:   Fri Jan 6 17:57:54 2017 +0100

    [armhf] Add support for switch hardware on Turris Omnia
---
 debian/changelog                                   |   1 +
 ...ris-omnia-add-support-for-ethernet-switch.patch | 102 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 3 files changed, 104 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6f1e78..986c0fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ linux (4.9-1~exp1) UNRELEASED; urgency=medium
   * enable `perf data' support; patch by Sebastian Andrzej Siewior
     (Closes: #846597)
   * [rt] Update to 4.9-rt1 and reenable
+  * [armhf] Add support for switch hardware on Turris Omnia
 
  -- Uwe Kleine-König <ukleinek at debian.org>  Sun, 18 Dec 2016 17:53:39 +0100
 
diff --git a/debian/patches/features/arm/arm-dts-turris-omnia-add-support-for-ethernet-switch.patch b/debian/patches/features/arm/arm-dts-turris-omnia-add-support-for-ethernet-switch.patch
new file mode 100644
index 0000000..80b7a7a
--- /dev/null
+++ b/debian/patches/features/arm/arm-dts-turris-omnia-add-support-for-ethernet-switch.patch
@@ -0,0 +1,102 @@
+From: Uwe Kleine-König <uwe at kleine-koenig.org>
+Date: Tue, 3 Jan 2017 20:35:01 +0100
+Subject: [PATCH] ARM: dts: turris-omnia: add support for ethernet switch
+Origin: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=7b7db5ab33d2292d9b037cda0c41a795b094d940
+
+The Turris Omnia features a Marvell MV88E6176 ethernet switch. Add it to
+the dts.
+
+Signed-off-by: Uwe Kleine-König <uwe at kleine-koenig.org>
+Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+Tested-by: Andreas Färber <afaerber at suse.de>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+---
+ arch/arm/boot/dts/armada-385-turris-omnia.dts | 58 +++++++++++++++++++++++++--
+ 1 file changed, 55 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts
+index ab49acb2d452..28eede180e4f 100644
+--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
++++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
+@@ -122,7 +122,7 @@
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&ge0_rgmii_pins>;
+ 	status = "okay";
+-	phy-mode = "rgmii-id";
++	phy-mode = "rgmii";
+ 
+ 	fixed-link {
+ 		speed = <1000>;
+@@ -135,7 +135,7 @@
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&ge1_rgmii_pins>;
+ 	status = "okay";
+-	phy-mode = "rgmii-id";
++	phy-mode = "rgmii";
+ 
+ 	fixed-link {
+ 		speed = <1000>;
+@@ -273,7 +273,59 @@
+ 		/* irq is connected to &pcawan pin 7 */
+ 	};
+ 
+-	/* Switch MV88E7176 at address 0x10 */
++	/* Switch MV88E6176 at address 0x10 */
++	switch at 10 {
++		compatible = "marvell,mv88e6085";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		dsa,member = <0 0>;
++
++		reg = <0x10>;
++
++		ports {
++			#address-cells = <1>;
++			#size-cells = <0>;
++
++			ports at 0 {
++				reg = <0>;
++				label = "lan0";
++			};
++
++			ports at 1 {
++				reg = <1>;
++				label = "lan1";
++			};
++
++			ports at 2 {
++				reg = <2>;
++				label = "lan2";
++			};
++
++			ports at 3 {
++				reg = <3>;
++				label = "lan3";
++			};
++
++			ports at 4 {
++				reg = <4>;
++				label = "lan4";
++			};
++
++			ports at 5 {
++				reg = <5>;
++				label = "cpu";
++				ethernet = <&eth1>;
++				phy-mode = "rgmii-id";
++
++				fixed-link {
++					speed = <1000>;
++					full-duplex;
++				};
++			};
++
++			/* port 6 is connected to eth0 */
++		};
++	};
+ };
+ 
+ &pinctrl {
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 1970670..d528528 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,6 +56,7 @@ features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
 features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
 features/x86/x86-make-x32-syscall-support-conditional.patch
 features/arm/arm-dts-add-support-for-turris-omnia.patch
+features/arm/arm-dts-turris-omnia-add-support-for-ethernet-switch.patch
 
 # Miscellaneous bug fixes
 bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git