patches: openwrt: rebase Turris Omnia support on correct commit

patches/openwrt/wip/0005-Turris-Omnia-Improved-suppport.patch

-From 12d90ca504123ddbe1b951c0e4fb69d126789d17 Mon Sep 17 00:00:00 2001
+From 140c7fa1d217aa241311a8ed98072dc4022c5c2c Mon Sep 17 00:00:00 2001
 From: Michal Hrusecky <Michal@Hrusecky.net>
 Date: Fri, 22 Feb 2019 08:30:39 +0100
 Subject: [PATCH] Turris Omnia: Improved suppport
 
 ---
- ...nia-Add-separate-DTS-for-SFP-support.patch | 231 +++++++++++++
+ ...nia-Add-separate-DTS-for-SFP-support.patch | 234 +++++++++++++
  .../8890-turris-omnia-led-driver.patch        | 323 ++++++++++++++++++
  ...91-turris-omnia-custom-led-functions.patch | 269 +++++++++++++++
  ...8892-turris-omnia-enable-leds-in-dts.patch | 102 ++++++
- 4 files changed, 925 insertions(+)
+ 4 files changed, 928 insertions(+)
  create mode 100644 target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch
  create mode 100644 target/linux/mvebu/patches-4.14/8890-turris-omnia-led-driver.patch
  create mode 100644 target/linux/mvebu/patches-4.14/8891-turris-omnia-custom-led-functions.patch
@@ -16,11 +16,11 @@ Subject: [PATCH] Turris Omnia: Improved suppport
 
 diff --git a/target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch b/target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch
 new file mode 100644
-index 0000000000..5b1fbda0ad
+index 0000000000..6f98c5c131
 --- /dev/null
 +++ b/target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch
-@@ -0,0 +1,231 @@
-+From fbdfa10edabdeb83ac3604a783b433913621541b Mon Sep 17 00:00:00 2001
+@@ -0,0 +1,234 @@
++From bfc96ed32855077d2959f617aa285d1ec9fbb07d Mon Sep 17 00:00:00 2001
 +From: Tomas Hlavacek <tmshlvck@gmail.com>
 +Date: Sat, 11 Aug 2018 21:21:50 +0200
 +Subject: [PATCH] Turris Omnia: Add separate DTS for SFP support
@@ -52,13 +52,13 @@ index 0000000000..5b1fbda0ad
 + 4 files changed, 77 insertions(+), 15 deletions(-)
 + create mode 100644 arch/arm/boot/dts/armada-385-turris-omnia-phy.dts
 + create mode 100644 arch/arm/boot/dts/armada-385-turris-omnia-sfp.dts
-+ rename arch/arm/boot/dts/{armada-385-turris-omnia.dts => armada-385-turris-omnia.dtsi} (89%)
++ rename arch/arm/boot/dts/{armada-385-turris-omnia.dts => armada-385-turris-omnia.dtsi} (91%)
 +
 +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-+index f4f5aeaf3298..b0016846cdf7 100644
++index eff87a344566..18fa6064492d 100644
 +--- a/arch/arm/boot/dts/Makefile
 ++++ b/arch/arm/boot/dts/Makefile
-+@@ -1206,7 +1206,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
++@@ -1028,7 +1028,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
 + 	armada-385-linksys-rango.dtb \
 + 	armada-385-linksys-shelby.dtb \
 + 	armada-385-synology-ds116.dtb \
@@ -134,19 +134,22 @@ index 0000000000..5b1fbda0ad
 ++	sfp = <&sfp>;
 ++};
 +diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dtsi
-+similarity index 89%
++similarity index 91%
 +rename from arch/arm/boot/dts/armada-385-turris-omnia.dts
 +rename to arch/arm/boot/dts/armada-385-turris-omnia.dtsi
-+index 768b6c5d2129..e5343d68e4d7 100644
++index 06831e1e3f80..e216c653e013 100644
 +--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
 ++++ b/arch/arm/boot/dts/armada-385-turris-omnia.dtsi
-+@@ -3,13 +3,11 @@
++@@ -2,7 +2,7 @@
 +  * Device Tree file for the Turris Omnia
 +  *
 +  * Copyright (C) 2016 Uwe Kleine-König <uwe@kleine-koenig.org>
 +- * Copyright (C) 2016 Tomas Hlavacek <tmshlvkc@gmail.com>
 ++ * Copyright (C) 2016-2019 Tomas Hlavacek <tmshlvkc@gmail.com>
 +  *
++  * This file is dual-licensed: you can use it either under the terms
++  * of the GPL or the X11 license, at your option. Note that this dual
++@@ -41,8 +41,6 @@
 +  * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf
 +  */
 + 
@@ -155,7 +158,7 @@ index 0000000000..5b1fbda0ad
 + #include <dt-bindings/gpio/gpio.h>
 + #include <dt-bindings/input/input.h>
 + #include "armada-385.dtsi"
-+@@ -84,8 +82,9 @@
++@@ -117,8 +115,9 @@
 + 	};
 + };
 + 
@@ -166,7 +169,7 @@ index 0000000000..5b1fbda0ad
 + 	pinctrl-names = "default";
 + 	pinctrl-0 = <&ge0_rgmii_pins>;
 + 	status = "okay";
-+@@ -95,7 +94,7 @@
++@@ -128,7 +127,7 @@
 + 		speed = <1000>;
 + 		full-duplex;
 + 	};
@@ -175,7 +178,7 @@ index 0000000000..5b1fbda0ad
 + 
 + /* Connected to 88E6176 switch, port 5 */
 + &eth1 {
-+@@ -110,11 +109,9 @@
++@@ -143,11 +142,9 @@
 + 	};
 + };
 + 
@@ -189,7 +192,7 @@ index 0000000000..5b1fbda0ad
 + };
 + 
 + &i2c0 {
-+@@ -177,7 +174,7 @@
++@@ -210,7 +207,7 @@
 + 			/* routed to PCIe2 connector (CN62A) */
 + 		};
 + 
@@ -198,7 +201,7 @@ index 0000000000..5b1fbda0ad
 + 			#address-cells = <1>;
 + 			#size-cells = <0>;
 + 			reg = <4>;
-+@@ -206,7 +203,7 @@
++@@ -239,7 +236,7 @@
 + 			#size-cells = <0>;
 + 			reg = <7>;
 + 
@@ -207,7 +210,7 @@ index 0000000000..5b1fbda0ad
 + 				/*
 + 				 * GPIO expander for SFP+ signals and
 + 				 * and phy irq
-+@@ -215,7 +212,7 @@
++@@ -248,7 +245,7 @@
 + 				reg = <0x71>;
 + 
 + 				pinctrl-names = "default";
@@ -216,7 +219,7 @@ index 0000000000..5b1fbda0ad
 + 
 + 				interrupt-parent = <&gpio1>;
 + 				interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
-+@@ -233,7 +230,7 @@
++@@ -266,7 +263,7 @@
 + 	status = "okay";
 + 
 + 	phy1: phy@1 {
@@ -225,7 +228,7 @@ index 0000000000..5b1fbda0ad
 + 		compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22";
 + 		reg = <1>;
 + 
-+@@ -293,10 +290,21 @@
++@@ -326,10 +323,21 @@
 + 			/* port 6 is connected to eth0 */
 + 		};
 + 	};