patches/openwrt: Turris Omnia support patch: rebase

patches/openwrt/wip/0005-mvebu-initial-support-for-Omnia-on-5.4-kernel.patch

@@ -171,34 +171,34 @@ index 0000000..61756be
 +  *
 +  * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf
 +  */
-+ 
++
 +-/dts-v1/;
 +-
 + #include <dt-bindings/gpio/gpio.h>
 + #include <dt-bindings/input/input.h>
 + #include "armada-385.dtsi"
-+@@ -82,6 +80,17 @@
++@@ -83,6 +83,17 @@
 + 			};
 + 		};
 + 	};
 ++
-++	sfp: sfp {
-++		compatible = "sff,sfp";
-++		status = "disabled";
-++		i2c-bus = <&i2csfp>;
-++		tx-fault-gpios = <&sfpgpio 0 GPIO_ACTIVE_HIGH>;
-++		tx-disable-gpios = <&sfpgpio 1 GPIO_ACTIVE_HIGH>;
-++		rate-select0-gpios = <&sfpgpio 2 GPIO_ACTIVE_HIGH>;
-++		los-gpios = <&sfpgpio 3 GPIO_ACTIVE_HIGH>;
-++		mod-def0-gpios = <&sfpgpio 4 GPIO_ACTIVE_LOW>;
-++	};
+++       sfp: sfp {
+++               compatible = "sff,sfp";
+++               status = "disabled";
+++               i2c-bus = <&i2csfp>;
+++               tx-fault-gpios = <&sfpgpio 0 GPIO_ACTIVE_HIGH>;
+++               tx-disable-gpios = <&sfpgpio 1 GPIO_ACTIVE_HIGH>;
+++               rate-select0-gpios = <&sfpgpio 2 GPIO_ACTIVE_HIGH>;
+++               los-gpios = <&sfpgpio 3 GPIO_ACTIVE_HIGH>;
+++               mod-def0-gpios = <&sfpgpio 4 GPIO_ACTIVE_LOW>;
+++       };
 + };
-+ 
-+ /* Connected to 88E6176 switch, port 6 */
-+@@ -110,11 +119,10 @@
++
++ &bm {
++@@ -125,11 +136,10 @@
 + 	};
 + };
-+ 
++
 +-/* WAN port */
 ++/* WAN dual-personality port */
 + &eth2 {
@@ -206,12 +206,9 @@ index 0000000..61756be
 + 	status = "okay";
 +-	phy-mode = "sgmii";
 +-	phy = <&phy1>;
-+       buffer-manager = <&bm>;
-+       bm,pool-long = <2>;
-+       bm,pool-short = <3>;
-+ };
-+ 
-+ &i2c0 {
++ 	buffer-manager = <&bm>;
++ 	bm,pool-long = <2>;
++ 	bm,pool-short = <3>;
 +@@ -177,7 +185,7 @@
 + 			/* routed to PCIe2 connector (CN62A) */
 + 		};