mediatek: add kernel 5.15 support

target/linux/mediatek/Makefile

@@ -6,9 +6,10 @@ ARCH:=arm
 BOARD:=mediatek
 BOARDNAME:=MediaTek Ralink ARM
 SUBTARGETS:=mt7622 mt7623 mt7629
-FEATURES:=dt-overlay emmc fpu gpio nand pci pcie separate_ramdisk squashfs usb
+FEATURES:=dt-overlay emmc fpu gpio nand pci pcie rootfs-part separate_ramdisk squashfs usb
 
 KERNEL_PATCHVER:=5.10
+KERNEL_TESTING_PATCHVER:=5.15
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \

target/linux/mediatek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr.sh

@@ -0,0 +1,14 @@
+[ ! -e /etc/fw_env.config ] && exit 0
+
+. /lib/functions.sh
+
+case "$(board_name)" in
+bananapi,bpi-r2|\
+bananapi,bpi-r64|\
+unielec,u7623-02)
+	[ -z "$(fw_printenv -n ethaddr 2>/dev/null)" ] &&
+		fw_setenv ethaddr "$(cat /sys/class/net/eth0/address)"
+	;;
+esac
+
+exit 0

target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi

@@ -144,6 +144,10 @@
 		switch@0 {
 			compatible = "mediatek,mt7531";
 			reg = <0>;
+			interrupt-controller;
+			#interrupt-cells = <1>;
+			interrupt-parent = <&pio>;
+			interrupts = <53 IRQ_TYPE_LEVEL_HIGH>;
 			reset-gpios = <&pio 54 0>;
 
 			ports {

target/linux/mediatek/dts/mt7622-rfb1-ubi.dts

@@ -3,10 +3,13 @@
 #include "mt7622-rfb1.dts"
 / {
 	model = "MT7622_MT7531 RFB (UBI)";
-	compatible = "mediatek,mt7622,ubi";
+	compatible = "mediatek,mt7622-rfb1-ubi";
 };
 
 &snand {
+	mediatek,bmt-v2;
+	mediatek,bmt-remap-range = <0x0 0x6c0000>;
+
 	partitions {
 		compatible = "fixed-partitions";
 		#address-cells = <1>;
@@ -35,22 +38,19 @@
 
 		factory: partition@1c0000 {
 			label = "Factory";
-			reg = <0x1c0000 0x0040000>;
+			reg = <0x1c0000 0x0100000>;
 		};
 
 		partition@200000 {
 			label = "kernel";
-			reg = <0x200000 0x400000>;
+			reg = <0x2c0000 0x400000>;
 		};
 
-		partition@600000 {
+		partition@6c0000 {
 			label = "ubi";
-			reg = <0x600000 0x1C00000>;
+			reg = <0x6c0000 0x6f00000>;
 		};
 
-		partition@2200000 {
+		/delete-node/ partition@2200000;
-			label = "User_data";
-			reg = <0x2200000 0x4000000>;
-		};
 	};
 };

target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts

@@ -0,0 +1,327 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+/dts-v1/;
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+#include "mt7622.dtsi"
+#include "mt6380.dtsi"
+
+/ {
+	model = "Ruijie RG-EW3200GX PRO";
+	compatible = "ruijie,rg-ew3200gx-pro", "mediatek,mt7622";
+
+	aliases {
+		ethernet0 = &gmac0;
+		label-mac-device = &gmac0;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n1";
+		bootargs = "console=ttyS0,115200n1 swiotlb=512";
+	};
+
+	cpus {
+		cpu@0 {
+			proc-supply = <&mt6380_vcpu_reg>;
+			sram-supply = <&mt6380_vm_reg>;
+		};
+
+		cpu@1 {
+			proc-supply = <&mt6380_vcpu_reg>;
+			sram-supply = <&mt6380_vm_reg>;
+		};
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
+		};
+
+		wps {
+			label = "wps";
+			linux,code = <KEY_WPS_BUTTON>;
+			gpios = <&pio 102 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		mesh_green {
+			label = "green:mesh";
+			gpios = <&pio 79 GPIO_ACTIVE_LOW>;
+		};
+
+		mesh_red {
+			label = "red:mesh";
+			gpios = <&pio 82 GPIO_ACTIVE_LOW>;
+		};
+
+		led_system: system_blue {
+			label = "blue:system";
+			gpios = <&pio 81 GPIO_ACTIVE_LOW>;
+			default-state = "on";
+		};
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x40000000>;
+	};
+};
+
+&eth {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&eth_pins>;
+
+	gmac0: mac@0 {
+		compatible = "mediatek,eth-mac";
+		reg = <0>;
+		phy-connection-type = "2500base-x";
+		fixed-link {
+			speed = <2500>;
+			full-duplex;
+			pause;
+		};
+	};
+
+	mdio: mdio-bus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		switch@0 {
+			compatible = "mediatek,mt7531";
+			reg = <0>;
+			reset-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
+			
+			interrupt-controller;
+			#interrupt-cells = <2>;
+			interrupt-parent = <&pio>;
+			interrupts = <53 IRQ_TYPE_LEVEL_HIGH>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+					label = "lan1";
+				};
+
+				port@1 {
+					reg = <1>;
+					label = "lan2";
+				};
+
+				port@2 {
+					reg = <2>;
+					label = "lan3";
+				};
+
+				port@3 {
+					reg = <3>;
+					label = "lan4";
+				};
+
+				wan: port@4 {
+					reg = <4>;
+					label = "wan";
+				};
+
+				port@6 {
+					reg = <6>;
+					label = "cpu";
+					ethernet = <&gmac0>;
+					phy-mode = "2500base-x";
+
+					fixed-link {
+						speed = <2500>;
+						full-duplex;
+						pause;
+					};
+				};
+			};
+		};
+	};
+};
+
+&pcie0 {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie0_pins>;
+};
+
+&slot0 {
+	mt7915@0,0 {
+		reg = <0x0000 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x5000>;
+		ieee80211-freq-limit = <5000000 6000000>;
+	};
+};
+
+&pio {
+	epa_elna_pins: epa-elna-pins {
+		mux {
+			function = "antsel";
+			groups = "antsel0", "antsel1", "antsel2", "antsel3",
+				"antsel4", "antsel5", "antsel6", "antsel7",
+				"antsel8", "antsel9", "antsel12", "antsel13",
+				"antsel14", "antsel15", "antsel16", "antsel17";
+		};
+	};
+
+	eth_pins: eth-pins {
+		mux {
+			function = "eth";
+			groups = "mdc_mdio", "rgmii_via_gmac2";
+		};
+	};
+
+	pcie0_pins: pcie0-pins {
+		mux {
+			function = "pcie";
+			groups = "pcie0_pad_perst",
+				 "pcie0_0_waken",
+				 "pcie0_0_clkreq";
+		};
+	};
+
+	pmic_bus_pins: pmic-bus-pins {
+		mux {
+			function = "pmic";
+			groups = "pmic_bus";
+		};
+	};
+
+	spi_nor_pins: spi-nor-pins {
+		mux {
+			function = "flash";
+			groups = "spi_nor";
+		};
+	};
+
+	uart0_pins: uart0-pins {
+		mux {
+			function = "uart";
+			groups = "uart0_0_tx_rx";
+		};
+	};
+
+	watchdog_pins: watchdog-pins {
+		mux {
+			function = "watchdog";
+			groups = "watchdog";
+		};
+	};
+};
+
+&pwrap {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pmic_bus_pins>;
+};
+
+&nor_flash {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi_nor_pins>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "Preloader";
+				reg = <0x0 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "ATF";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			partition@60000 {
+				label = "u-boot";
+				reg = <0x60000 0x50000>;
+				read-only;
+			};
+
+			partition@B0000 {
+				label = "u-boot-env";
+				reg = <0xb0000 0x20000>;
+			};
+
+			factory: partition@D0000 {
+				label = "Factory";
+				reg = <0xd0000 0x80000>;
+				read-only;
+			};
+
+			partition@150000 {
+				label = "product_info";
+				reg = <0x150000 0x10000>;
+				read-only;
+			};
+
+			partition@160000 {
+				label = "kdump";
+				reg = <0x160000 0x10000>;
+				read-only;
+			};
+
+			partition@170000 {
+				compatible = "denx,fit";
+				label = "firmware";
+				reg = <0x170000 0xe90000>;
+			};
+		};
+	};
+};
+
+&rtc {
+	status = "disabled";
+};
+
+&uart0 {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pins>;
+};
+
+&watchdog {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&watchdog_pins>;
+};
+
+&wmac {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&epa_elna_pins>;
+	mediatek,mtd-eeprom = <&factory 0x0>;
+};

target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi

@@ -161,21 +161,17 @@
 		reg = <0>;
 
 		phy-mode = "2500base-x";
-
+		phy-handle = <&phy0>;
-		fixed-link {
+		phy-connection-type = "2500base-x";
-			speed = <2500>;
-			full-duplex;
-		};
 	};
 
 	mdio: mdio-bus {
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		ethernet-phy@7 {
+		phy0: ethernet-phy@8 {
-			/* Marvell AQRate AQR112W - no driver */
 			compatible = "ethernet-phy-ieee802.3-c45";
-			reg = <0x7>;
+			reg = <0x8>;
 		};
 	};
 };

target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts

@@ -12,7 +12,6 @@
 	compatible = "xiaomi,redmi-router-ax6s", "mediatek,mt7622";
 
 	aliases {
-		ethernet0 = &gmac0;
 		serial0 = &uart0;
 		led-boot = &led_power_amber;
 		led-failsafe = &led_power_amber;
@@ -21,6 +20,7 @@
 	};
 
 	chosen {
+		stdout-path = "serial0:115200n8";
 		bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n8 swiotlb=512";
 	};
 
@@ -146,6 +146,10 @@
 
 		phy-connection-type = "2500base-x";
 
+		nvmem-cells = <&macaddr_factory_4>;
+		nvmem-cell-names = "mac-address";
+		mac-address-increment = <(-1)>;
+
 		fixed-link {
 			speed = <2500>;
 			full-duplex;
@@ -160,6 +164,10 @@
 		switch@0 {
 			compatible = "mediatek,mt7531";
 			reg = <0>;
+			interrupt-controller;
+			#interrupt-cells = <1>;
+			interrupt-parent = <&pio>;
+			interrupts = <53 IRQ_TYPE_LEVEL_HIGH>;
 			reset-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
 
 			ports {
@@ -210,6 +218,7 @@
 
 	mediatek,bmt-v2;
 	mediatek,bmt-table-size = <0x1000>;
+	mediatek,bmt-remap-range = <0x0 0x6c0000>;
 
 	partitions {
 		compatible = "fixed-partitions";
@@ -242,49 +251,54 @@
 		partition@180000 {
 			label = "bdata";
 			reg = <0x180000 0x40000>;
-			read-only;
 		};
 
 		factory: partition@1c0000 {
 			label = "factory";
 			reg = <0x1c0000 0x80000>;
 			read-only;
+
+			compatible = "nvmem-cells";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			macaddr_factory_4: macaddr@4 {
+				reg = <0x4 0x6>;
+			};
 		};
 
 		partition@240000 {
 			label = "crash";
 			reg = <0x240000 0x40000>;
+			read-only;
 		};
 
 		partition@280000 {
 			label = "crash_log";
 			reg = <0x280000 0x40000>;
+			read-only;
 		};
 
+		/* Shrunk and renamed from "firmware"
+		 * as to not break luci size checks
+		 */
 		partition@2c0000 {
-			label = "firmware";
+			label = "kernel";
 			compatible = "denx,fit";
-			openwrt,cmdline-match = "firmware=0";
+			reg = <0x2c0000 0x400000>;
-			reg = <0x2c0000 0x1e00000>;
 		};
 
-		partition@20c0000 {
-			label = "firmware1";
-			compatible = "denx,fit";
-			openwrt,cmdline-match = "firmware=1";
-			reg = <0x20c0000 0x1e00000>;
-		};
 
 		/* ubi partition is the result of squashing
-		 * next consecutive stock partitions:
+		 * consecutive stock partitions:
-		 * - overlay (ubi overlay)
+		 * - firmware (partially)
+		 * - firmware1
+		 * - overlay
 		 * - obr
-		 * resulting ~65MiB space for packages.
 		 */
-
+		partition@6c0000 {
-		partition@3ec0000 {
 			label = "ubi";
-			reg = <0x3ec0000 0x4140000>;
+			reg = <0x6C0000 0x6f00000>;
 		};
 	};
 };

target/linux/mediatek/dts/mt7623a-unielec-u7623-02-emmc-512m.dts

@@ -4,11 +4,15 @@
  */
 
 /dts-v1/;
-#include "mt7623a-unielec-u7623-02-emmc.dtsi"
+#include "mt7623a-unielec-u7623-02.dtsi"
 
 / {
-	model = "UniElec U7623-02 eMMC (512M RAM)";
+	model = "UniElec U7623-02 eMMC (legacy loader, 512M RAM)";
-	compatible = "unielec,u7623-02-emmc-512m", "unielec,u7623-02-emmc", "mediatek,mt7623";
+	compatible = "unielec,u7623-02-emmc-512m", "unielec,u7623-02", "mediatek,mt7623";
+
+	chosen {
+		bootargs = "earlycon=uart8250,mmio32,0x11004000 console=ttyS0,115200 blkdevparts=mmcblk0:3M@6M(recovery),256M@9M(root) rootfstype=squashfs root=/dev/mmcblk0p2";
+	};
 
 	memory@80000000 {
 		device_type = "memory";

target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dts

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+/*
+ * Copyright 2018 Kristian Evensen <kristian.evensen@gmail.com>
+ */
+
+/dts-v1/;
+#include "mt7623a-unielec-u7623-02.dtsi"
+
+/ {
+	model = "UniElec U7623-02 eMMC";
+	compatible = "unielec,u7623-02", "mediatek,mt7623";
+};

target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dtsi

@@ -8,15 +8,20 @@
 #include "mt6323.dtsi"
 
 / {
-	compatible = "unielec,u7623-02-emmc", "mediatek,mt7623";
+	compatible = "unielec,u7623-02", "mediatek,mt7623";
 
 	aliases {
-		serial2 = &uart2;
+		serial0 = &uart2;
+		ethernet0 = &gmac0;
+		mmc0 = &mmc0;
+		led-boot = &led3_green;
+		led-failsafe = &led3_green;
+		led-running = &led3_green;
+		led-upgrade = &led3_green;
 	};
 
 	chosen {
-		bootargs = "root=/dev/mmcblk0p2 rootfstype=squashfs,f2fs console=ttyS0,115200 blkdevparts=mmcblk0:3M@6M(recovery),256M@9M(root)";
+		stdout-path = "serial0:115200n8";
-		stdout-path = "serial2:115200n8";
 	};
 
 	cpus {
@@ -81,7 +86,7 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&led_pins_unielec>;
 
-		led3 {
+		led3_green: led3 {
 			label = "u7623-01:green:led3";
 			gpios = <&pio 14 GPIO_ACTIVE_LOW>;
 		};
@@ -298,6 +303,10 @@
 	};
 };
 
+&mt6323keys {
+	mediatek,long-press-mode = <0>;
+};
+
 &uart2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart2_pins_b>;
@@ -324,6 +333,10 @@
 	pinctrl-0 = <&pcie_default>;
 	status = "okay";
 
+	pcie@0,0 {
+		status = "okay";
+	};
+
 	pcie@1,0 {
 		status = "okay";
 	};
@@ -333,6 +346,10 @@
 	};
 };
 
+&pcie0_phy {
+	status = "okay";
+};
+
 &pcie1_phy {
 	status = "okay";
 };

target/linux/mediatek/files/drivers/mtd/mtk-snand/mtk-snand-ids.c

@@ -131,6 +131,10 @@ static const struct snand_flash_info snand_flash_ids[] = {
 		   SNAND_MEMORG_4G_2K_64,
 		   &snand_cap_read_from_cache_quad_q2d,
 		   &snand_cap_program_load_x4),
+	SNAND_INFO("GD5F1GQ5xExxG", SNAND_ID(SNAND_ID_DYMMY, 0xc8, 0x51),
+		   SNAND_MEMORG_1G_2K_128,
+		   &snand_cap_read_from_cache_quad_q2d,
+		   &snand_cap_program_load_x4),
 	SNAND_INFO("GD5F2GQ5UExxG", SNAND_ID(SNAND_ID_DYMMY, 0xc8, 0x52),
 		   SNAND_MEMORG_2G_2K_128,
 		   &snand_cap_read_from_cache_quad_q2d,