Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi

@@ -24,13 +24,13 @@
 		wlan5g {
 			label = "green:wifi5g";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
 			label = "green:wifi2g";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		led_status_green: status_green {

target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi

@@ -41,13 +41,13 @@
 		band2g_g {
 			label = "green:band2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		band5g_g {
 			label = "green:band5g";
 			gpios = <&ath9k1 1 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 
 		router {

target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts

@@ -69,25 +69,25 @@
 		wlan2g-green {
 			label = "green:wlan2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan2g-yellow {
 			label = "yellow:wlan2g";
 			gpios = <&ath9k0 3 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0assoc";
+			linux,default-trigger = "phy1assoc";
 		};
 
 		wlan5g-green {
 			label = "green:wlan5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g-yellow {
 			label = "yellow:wlan5g";
 			gpios = <&ath9k1 3 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1assoc";
+			linux,default-trigger = "phy0assoc";
 		};
 	};
 

target/linux/ath79/dts/ar7161_netgear_wndap360.dts

@@ -10,6 +10,10 @@
 	compatible = "netgear,wndap360", "qca,ar7161";
 	model = "Netgear WNDAP360";
 
+	chosen {
+		/delete-property/ bootargs;
+	};
+
 	aliases {
 		led-boot = &led_power_orange;
 		led-failsafe = &led_power_orange;
@@ -49,6 +53,8 @@
 &eth0 {
 	status = "okay";
 
+	pll-data = <0x11110000 0x00001099 0x00991099>;
+
 	phy-mode = "rgmii";
 	phy-handle = <&phy1>;
 

target/linux/ath79/dts/ar7161_netgear_wndr.dtsi

@@ -67,12 +67,12 @@
 		wlan2g {
 			label = "green:wlan2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 		wlan5g {
 			label = "blue:wlan5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 	};
 

target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi

@@ -57,25 +57,25 @@
 		wlan2g-green {
 			label = "green:wlan2g";
 			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy0assoc";
+			linux,default-trigger = "phy1assoc";
 		};
 
 		wlan2g-yellow {
 			label = "yellow:wlan2g";
 			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy0tpt";
+			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g-green {
 			label = "green:wlan5g";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy1assoc";
+			linux,default-trigger = "phy0assoc";
 		};
 
 		wlan5g-yellow {
 			label = "yellow:wlan5g";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy1tpt";
+			linux,default-trigger = "phy0tpt";
 		};
 	};
 

target/linux/ath79/image/generic.mk

@@ -2238,6 +2238,7 @@ define Device/netgear_wndap360
   $(Device/netgear_generic)
   SOC := ar7161
   DEVICE_MODEL := WNDAP360
+  DEVICE_PACKAGES := kmod-owl-loader
   IMAGE_SIZE := 7744k
   BLOCKSIZE := 256k
   KERNEL := kernel-bin | append-dtb | gzip | uImage gzip

target/linux/realtek/base-files/etc/board.d/02_network

@@ -52,6 +52,7 @@ realtek_setup_macs()
 	local label_mac=""
 
 	case $board in
+	datto,l8|\
 	edgecore,ecs4100-12ph|\
 	linksys,lgs310c|\
 	linksys,lgs328c|\
@@ -186,6 +187,9 @@ realtek_setup_poe()
 	netgear,gs110tpp-v1)
 		ucidef_set_poe 130 "$(filter_port_list "$lan_list" "lan9 lan10")"
 		;;
+	datto,l8)
+		ucidef_set_poe 55 "lan5 lan6 lan7 lan8 lan4 lan3 lan2 lan1"
+		;;
 	engenius,ews2910p-v1|\
 	engenius,ews2910p-v3)
 		ucidef_set_poe 60 "$(filter_port_list "$lan_list" "lan9 lan10")"

target/linux/realtek/dts/rtl8380_datto_l8.dts

@@ -0,0 +1,212 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+
+#include "rtl838x.dtsi"
+
+/ {
+	compatible = "datto,l8", "realtek,rtl838x-soc";
+
+	model = "Datto L8";
+
+	aliases {
+		label-mac-device = &ethernet0;
+		led-boot = &led_power;
+		led-failsafe = &led_fault;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x10000000>;
+	};
+
+	leds: leds {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinmux_disable_sys_led>;
+		compatible = "gpio-leds";
+
+		led_power: led-0 {
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
+		};
+
+		/* high: LAN Mode, low: PoE Mode */
+		led_lan_mode: led-1 {
+			label = "green:lan-mode";
+			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+		};
+
+		led_fault: led-2 {
+			function = LED_FUNCTION_FAULT;
+			color = <LED_COLOR_ID_AMBER>;
+			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+		};
+
+		led_poe_max: led-3 {
+			label = "amber:poe-max";
+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		mode {
+			label = "mode";
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_LIGHTS_TOGGLE>;
+		};
+	};
+
+	gpio-restart {
+		compatible = "gpio-restart";
+		gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+		open-source;
+	};
+
+	virtual_flash {
+		compatible = "mtd-concat";
+
+		devices = <&fwconcat0>, <&fwconcat1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "firmware";
+				reg = <0x0 0x1a60000>;
+				compatible = "openwrt,uimage", "denx,uimage";
+				openwrt,ih-magic = <0x00703400>;
+			};
+		};
+	};
+};
+
+&mdio_aux {
+	status = "okay";
+
+	gpio1: expander@0 {
+		compatible = "realtek,rtl8231";
+		reg = <0>;
+
+		gpio-controller;
+		#gpio-cells = <2>;
+		gpio-ranges = <&gpio1 0 0 37>;
+
+		led-controller {
+			compatible = "realtek,rtl8231-leds";
+			status = "disabled";
+		};
+	};
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&mdio_bus0 {
+	INTERNAL_PHY(8)
+	INTERNAL_PHY(9)
+	INTERNAL_PHY(10)
+	INTERNAL_PHY(11)
+	INTERNAL_PHY(12)
+	INTERNAL_PHY(13)
+	INTERNAL_PHY(14)
+	INTERNAL_PHY(15)
+};
+
+&switch0 {
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		SWITCH_PORT(8, 1, internal)
+		SWITCH_PORT(9, 2, internal)
+		SWITCH_PORT(10, 3, internal)
+		SWITCH_PORT(11, 4, internal)
+		SWITCH_PORT(12, 5, internal)
+		SWITCH_PORT(13, 6, internal)
+		SWITCH_PORT(14, 7, internal)
+		SWITCH_PORT(15, 8, internal)
+
+		port@28 {
+			ethernet = <&ethernet0>;
+			reg = <28>;
+			phy-mode = "internal";
+			fixed-link {
+				speed = <1000>;
+				full-duplex;
+			};
+		};
+	};
+};
+
+&ethernet0 {
+	nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
+	nvmem-cell-names = "mac-address";
+};
+
+&spi0 {
+	status = "okay";
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x80000>;
+				read-only;
+			};
+			partition@80000 {
+				label = "u-boot-env";
+				reg = <0x80000 0x10000>;
+				nvmem-layout {
+					compatible = "u-boot,env";
+
+					macaddr_ubootenv_ethaddr: ethaddr {
+						#nvmem-cell-cells = <1>;
+					};
+				};
+			};
+			partition@90000 {
+				label = "u-boot-env2";
+				reg = <0x90000 0x20000>;
+			};
+			partition@a0000 {
+				label = "cfg";
+				reg = <0xa0000 0x400000>;
+			};
+			partition@4a0000 {
+				label = "log";
+				reg = <0x4a0000 0x100000>;
+			};
+			fwconcat0: partition@5a0000 {
+				label = "runtime";
+				reg = <0x5a0000 0xd30000>;
+			};
+			fwconcat1: partition@12d0000 {
+				label = "runtime2";
+				reg = <0x12d0000 0xd30000>;
+			};
+		};
+	};
+};

target/linux/realtek/image/rtl838x.mk

@@ -91,6 +91,19 @@ define Device/d-link_dgs-1210-28p-f
 endef
 TARGET_DEVICES += d-link_dgs-1210-28p-f
 
+define Device/datto_l8
+  $(Device/uimage-rt-loader)
+  SOC := rtl8380
+  DEVICE_VENDOR := Datto
+  DEVICE_MODEL := L8
+  DEVICE_ALT0_VENDOR := Open Mesh
+  DEVICE_ALT0_MODEL := S8-L
+  DEVICE_PACKAGES += realtek-poe
+  UIMAGE_MAGIC := 0x00703400
+  IMAGE_SIZE := 13504k
+endef
+TARGET_DEVICES += datto_l8
+
 define Device/engenius_ews2910p-v1
   $(Device/engenius_ews2910p)
   SOC := rtl8380

target/linux/x86/64/config-6.12

@@ -104,6 +104,7 @@ CONFIG_CRYPTO_CRCT10DIF=y
 # CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set
 CONFIG_CRYPTO_CRYPTD=y
 # CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
 CONFIG_CRYPTO_LRW=y
 # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
@@ -285,7 +286,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=y
 # CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
 CONFIG_INTEL_TCC=y
 CONFIG_INTEL_TDX_GUEST=y
-# CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_INTEL_TURBO_MAX_3=y
 # CONFIG_INTEL_TXT is not set
 # CONFIG_INTEL_UNCORE_FREQ_CONTROL is not set
 CONFIG_INTERVAL_TREE=y
@@ -445,7 +446,7 @@ CONFIG_RPS=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SATA_AHCI=y
-# CONFIG_SCHED_CORE is not set
+CONFIG_SCHED_CORE=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_SCHED_SMT=y

target/linux/x86/64/config-6.18

@@ -106,6 +106,7 @@ CONFIG_CRYPTO_CRCT10DIF=y
 # CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set
 CONFIG_CRYPTO_CRYPTD=y
 # CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
 CONFIG_CRYPTO_LRW=y
 # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
@@ -288,7 +289,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=y
 # CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
 CONFIG_INTEL_TCC=y
 CONFIG_INTEL_TDX_GUEST=y
-# CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_INTEL_TURBO_MAX_3=y
 # CONFIG_INTEL_TXT is not set
 # CONFIG_INTEL_UNCORE_FREQ_CONTROL is not set
 CONFIG_INTERVAL_TREE=y
@@ -451,7 +452,7 @@ CONFIG_RPS=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SATA_AHCI=y
-# CONFIG_SCHED_CORE is not set
+CONFIG_SCHED_CORE=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_SCHED_SMT=y