Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-08-23 17:04:38 +08:00
parent b0e86550ae cf765b1be6
commit 27b932f10c
7 changed files with 114 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/devel/tmon/Makefile
View File

@@ -14,7 +14,6 @@ define Package/tmon
SECTION:=devel
CATEGORY:=Development
TITLE:=Thermal monitoring and testing tool
VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
URL:=http://www.kernel.org
DEPENDS:=+libncursesw
endef

2
target/linux/generic/config-5.15
View File

@@ -318,8 +318,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
# CONFIG_ARM64_64K_PAGES is not set
# CONFIG_ARM64_AMU_EXTN is not set
# CONFIG_ARM64_BTI is not set
CONFIG_ARM64_CNP=y
# CONFIG_ARM64_CRYPTO is not set
# CONFIG_ARM64_E0PD is not set
# CONFIG_ARM64_EPAN is not set
# CONFIG_ARM64_ERRATUM_1024718 is not set
# CONFIG_ARM64_ERRATUM_1165522 is not set
# CONFIG_ARM64_ERRATUM_1286807 is not set

2
target/linux/generic/config-6.1
View File

@@ -348,8 +348,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
# CONFIG_ARM64_64K_PAGES is not set
# CONFIG_ARM64_AMU_EXTN is not set
# CONFIG_ARM64_BTI is not set
CONFIG_ARM64_CNP=y
# CONFIG_ARM64_CRYPTO is not set
# CONFIG_ARM64_E0PD is not set
# CONFIG_ARM64_EPAN is not set
# CONFIG_ARM64_ERRATUM_1024718 is not set
# CONFIG_ARM64_ERRATUM_1165522 is not set
# CONFIG_ARM64_ERRATUM_1286807 is not set

2
target/linux/generic/config-6.6
View File

@@ -326,7 +326,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
# CONFIG_ARM64_BTI is not set
CONFIG_ARM64_CNP=y
# CONFIG_ARM64_E0PD is not set
CONFIG_ARM64_EPAN=y
# CONFIG_ARM64_EPAN is not set
# CONFIG_ARM64_ERRATUM_1024718 is not set
# CONFIG_ARM64_ERRATUM_1165522 is not set
# CONFIG_ARM64_ERRATUM_1286807 is not set

2
target/linux/mediatek/mt7622/config-6.6
View File

@@ -242,7 +242,7 @@ CONFIG_MAXLINEAR_GPHY=y
CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_DEVRES=y
# CONFIG_MEDIATEK_2P5G_PHY is not set
# CONFIG_MEDIATEK_2P5GE_PHY is not set
CONFIG_MEDIATEK_GE_PHY=y
# CONFIG_MEDIATEK_GE_SOC_PHY is not set
CONFIG_MEDIATEK_WATCHDOG=y

120
target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
View File

@@ -9,6 +9,7 @@
* option) any later version.
*/
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
@@ -117,6 +118,23 @@
usb@22000 {
phy_type = "utmi";
dr_mode = "host";
port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
#trigger-source-cells = <0>;
hub_port1: port@1 {
reg = <1>;
#trigger-source-cells = <0>;
};
hub_port2: port@2 {
reg = <2>;
#trigger-source-cells = <0>;
};
};
};
mdio@24000 {
@@ -167,30 +185,90 @@
nvmem-cells = <&macaddr_uboot_4fc00 1>;
nvmem-cell-names = "mac-address";
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
default-state = "keep";
};
};
};
port@2 {
reg = <2>;
label = "lan1";
phy-handle = <&phy_port2>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
};
};
port@3 {
reg = <3>;
label = "lan2";
phy-handle = <&phy_port3>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
};
};
port@4 {
reg = <4>;
label = "lan3";
phy-handle = <&phy_port4>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
};
};
port@5 {
reg = <5>;
label = "lan4";
phy-handle = <&phy_port5>;
leds {
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0>;
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_LAN;
default-state = "keep";
};
};
};
};
};
@@ -316,32 +394,48 @@
leds {
compatible = "gpio-leds";
wps {
led-0 {
gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
label = "tp-link:green:wps";
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WPS;
};
system_green: system {
system_green: led-1 {
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
label = "tp-link:blue:system";
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_STATUS;
};
usb1 {
led-2 {
gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
label = "tp-link:green:usb1";
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_USB;
function-enumerator = <1>;
linux,default-trigger = "usbport";
trigger-sources = <&hub_port1>;
};
usb2 {
led-3 {
gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
label = "tp-link:green:usb2";
};
usbpower {
gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
label = "tp-link:usb:power";
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_USB;
function-enumerator = <2>;
linux,default-trigger = "usbport";
trigger-sources = <&hub_port2>;
};
};
gpio_export {
compatible = "gpio-export";
#size-cells = <0>;
usb-pwr {
gpio-export,name = "usb_pwr";
gpio-export,output = <1>;
gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
};
};
buttons {
compatible = "gpio-keys";

1
target/linux/mpc85xx/image/p1010.mk
View File

@@ -53,6 +53,7 @@ define Device/tplink_tl-wdr4900-v1
DEVICE_VARIANT := v1
DEVICE_COMPAT_VERSION := 1.1
DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
DEVICE_PACKAGES := kmod-usb-ledtrig-usbport
TPLINK_HEADER_VERSION := 1
TPLINK_HWID := 0x49000001
TPLINK_HWREV := 1