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

Merge Offical Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2023-06-12 20:16:12 +08:00
parent 960fe356e1 9519a62549
commit cd4d9c4a74
14 changed files with 215 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.1
View File

@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .32
LINUX_KERNEL_HASH-6.1.32 = 7c88b7a09ba2b9e47b78eba2b32b1db6a4d89636f7ddd586545f9671a2521a6c
LINUX_VERSION-6.1 = .33
LINUX_KERNEL_HASH-6.1.33 = b87d6ba8ea7328e8007a7ea9171d1aa0d540d95eacfcab09578e0a3b623dd2cd

2
package/firmware/layerscape/ls-dpl/Makefile
View File

@@ -12,7 +12,7 @@ PKG_VERSION:=21.08
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils
PKG_SOURCE_URL:=https://github.com/nxp-qoriq/mc-utils
PKG_SOURCE_VERSION:=LSDK-21.08
PKG_MIRROR_HASH:=372498ff4b5c8a1ac64ead5856d03ee021332f57771989ed6fe066745372b242

2
package/network/utils/layerscape/restool/Makefile
View File

@@ -12,7 +12,7 @@ PKG_VERSION:=21.08
PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/restool
PKG_SOURCE_URL:=https://github.com/nxp-qoriq/restool
PKG_SOURCE_VERSION:=LSDK-21.08
PKG_MIRROR_HASH:=0396644927b8f3da20183227562f695c8063d3d4c6bb606e8f31dda450e962e4

172
target/linux/ath79/dts/qca9561_tplink_tl-wdr6500-v2.dts Normal file
View File

@@ -0,0 +1,172 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca956x.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
compatible = "tplink,tl-wdr6500-v2", "qca,qca9561";
model = "TP-Link TL-WDR6500 v2";
aliases {
led-boot = &led_system;
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth1;
};
keys {
compatible = "gpio-keys";
reset {
label = "Reset button";
linux,code = <KEY_RESTART>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
};
leds {
compatible = "gpio-leds";
lan4 {
label = "green:lan4";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
lan3 {
label = "green:lan3";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
};
lan2 {
label = "green:lan2";
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
lan1 {
label = "green:lan1";
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
};
wan {
label = "green:wan";
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
};
led_system: system {
label = "white:system";
gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
};
};
&spi {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x000000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_0fc00: macaddr@0fc00 {
reg = <0x0fc00 0x6>;
};
};
partition@10000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x010000 0x7e0000>;
};
partition@7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
calibration_ath9k: calibration@1000 {
reg = <0x1000 0x440>;
};
calibration_ath10k: calibration@5000 {
reg = <0x5000 0x844>;
};
};
};
};
};
&uart {
status = "okay";
};
&pcie {
status = "okay";
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0 0 0 0 0>;
nvmem-cells = <&macaddr_uboot_0fc00>, <&calibration_ath10k>;
nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-2)>;
};
};
&mdio0 {
status = "okay";
};
&eth0 {
status = "okay";
phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_uboot_0fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
status = "okay";
nvmem-cells = <&macaddr_uboot_0fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
status = "okay";
nvmem-cells = <&macaddr_uboot_0fc00>, <&calibration_ath9k>;
nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <(-1)>;
};
&usb0 {
status = "okay";
};
&usb_phy0 {
status = "okay";
};

7
target/linux/ath79/generic/base-files/etc/board.d/01_leds
View File

@@ -30,6 +30,13 @@ tplink,cpe610-v2|\
tplink,tl-wa1201-v2)
ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
;;
tplink,tl-wdr6500-v2)
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x02"
ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x04"
ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x08"
ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x10"
;;
alfa-network,n2q)
ucidef_set_led_netdev "lan2" "LAN2" "orange:lan2" "eth1"
ucidef_set_led_switch "lan1" "LAN1" "orange:lan1" "switch0" "0x10"

3
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@@ -247,7 +247,8 @@ ath79_setup_interfaces()
comfast,cf-e560ac|\
qca,ap143-8m|\
qca,ap143-16m|\
tplink,tl-wr841hp-v3)
tplink,tl-wr841hp-v3|\
tplink,tl-wdr6500-v2)
ucidef_set_interface_wan "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"

16
target/linux/ath79/image/generic-tp-link.mk
View File

@@ -676,6 +676,22 @@ define Device/tplink_tl-wdr4900-v2
endef
TARGET_DEVICES += tplink_tl-wdr4900-v2
define Device/tplink_tl-wdr6500-v2
$(Device/tplink-8mlzma)
SOC := qca9561
DEVICE_MODEL := TL-WDR6500
DEVICE_VARIANT := v2
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev \
kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct
IMAGE_SIZE := 8000k
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
TPLINK_HWID := 0x65000002
TPLINK_HEADER_VERSION := 1
SUPPORTED_DEVICES += tl-wdr6500-v2
endef
TARGET_DEVICES += tplink_tl-wdr6500-v2
define Device/tplink_tl-wdr7500-v3
$(Device/tplink-8mlzma)
SOC := qca9558

2
target/linux/bcm27xx/patches-6.1/950-0120-Added-Device-IDs-for-August-DVB-T-205.patch
View File

@@ -9,7 +9,7 @@ Subject: [PATCH] Added Device IDs for August DVB-T 205
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -1944,6 +1944,10 @@ static const struct usb_device_id rtl28x
@@ -1964,6 +1964,10 @@ static const struct usb_device_id rtl28x
&rtl28xxu_props, "Compro VideoMate U650F", NULL) },
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
&rtl28xxu_props, "MaxMedia HU394-T", NULL) },

2
target/linux/bcm27xx/patches-6.1/950-0188-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
View File

@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
#define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201
@@ -1366,6 +1369,9 @@
@@ -1367,6 +1370,9 @@
#define USB_VENDOR_ID_XIAOMI 0x2717
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014

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

@@ -150,7 +150,6 @@ CONFIG_AF_UNIX_OOB=y
# CONFIG_AHCI_BRCM is not set
# CONFIG_AHCI_CEVA is not set
# CONFIG_AHCI_DWC is not set
# CONFIG_SATA_DWC_OLD_DMA is not set
# CONFIG_AHCI_IMX is not set
# CONFIG_AHCI_MVEBU is not set
# CONFIG_AHCI_QORIQ is not set
@@ -1278,6 +1277,7 @@ CONFIG_CRYPTO_PCRYPT=y
# CONFIG_CRYPTO_POLY1305_MIPS is not set
# CONFIG_CRYPTO_POLY1305_NEON is not set
# CONFIG_CRYPTO_POLY1305_X86_64 is not set
# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
# CONFIG_CRYPTO_RMD160 is not set
# CONFIG_CRYPTO_RNG is not set
# CONFIG_CRYPTO_RSA is not set
@@ -1310,6 +1310,8 @@ CONFIG_CRYPTO_SKCIPHER2=y
# CONFIG_CRYPTO_SM3_NEON is not set
# CONFIG_CRYPTO_SM4 is not set
# CONFIG_CRYPTO_SM4_ARM64_CE is not set
# CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SPECK is not set
# CONFIG_CRYPTO_STATS is not set
@@ -1606,7 +1608,6 @@ CONFIG_DQL=y
# CONFIG_DRM_I2C_NXP_TDA998X is not set
# CONFIG_DRM_I2C_SIL164 is not set
# CONFIG_DRM_I915 is not set
# CONFIG_DRM_ITE_IT6505 is not set
# CONFIG_DRM_IMX_LCDIF is not set
# CONFIG_DRM_ITE_IT6505 is not set
# CONFIG_DRM_ITE_IT66121 is not set
@@ -4927,6 +4928,7 @@ CONFIG_PINMUX=y
# CONFIG_PM_AUTOSLEEP is not set
# CONFIG_PM_DEBUG is not set
# CONFIG_PM_DEVFREQ is not set
# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
# CONFIG_PM_WAKELOCKS is not set
# CONFIG_POSIX_MQUEUE is not set
CONFIG_POSIX_TIMERS=y
@@ -5424,6 +5426,7 @@ CONFIG_RXKAD=y
# CONFIG_SATA_AHCI is not set
# CONFIG_SATA_AHCI_PLATFORM is not set
# CONFIG_SATA_DWC is not set
# CONFIG_SATA_DWC_OLD_DMA is not set
# CONFIG_SATA_FSL is not set
# CONFIG_SATA_HIGHBANK is not set
# CONFIG_SATA_HOST is not set
@@ -7051,6 +7054,7 @@ CONFIG_UNIX98_PTYS=y
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_UNIX_DIAG is not set
CONFIG_UNIX_SCM=y
# CONFIG_UNUSED_BOARD_FILES is not set
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_UNWINDER_FRAME_POINTER is not set
# CONFIG_UPROBES is not set

2
target/linux/generic/hack-6.1/259-regmap_dynamic.patch
View File

@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/property.h>
@@ -3511,3 +3512,5 @@ static int __init regmap_initcall(void)
@@ -3513,3 +3514,5 @@ static int __init regmap_initcall(void)
return 0;
}
postcore_initcall(regmap_initcall);

6
target/linux/generic/pending-6.1/630-packet_socket_type.patch
View File

@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -3372,6 +3374,7 @@ static int packet_create(struct net *net
@@ -3374,6 +3376,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -4007,6 +4010,16 @@ packet_setsockopt(struct socket *sock, i
@@ -4009,6 +4012,16 @@ packet_setsockopt(struct socket *sock, i
WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit);
return 0;
}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default:
return -ENOPROTOOPT;
}
@@ -4063,6 +4076,13 @@ static int packet_getsockopt(struct sock
@@ -4065,6 +4078,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;

2
target/linux/generic/pending-6.1/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
View File

@@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct rtnl_link {
rtnl_doit_func doit;
@@ -4811,7 +4811,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
@@ -4817,7 +4817,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
brport_nla_put_flag(skb, flags, mask,
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
brport_nla_put_flag(skb, flags, mask,

2
target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch
View File

@@ -7,7 +7,7 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is squash of all commits with ppfe driver taken from NXP 5.15 tree:
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/log/drivers/staging/fsl_ppfe?h=lf-5.15.y
https://github.com/nxp-qoriq/linux/commits/lf-5.15.y/drivers/staging/fsl_ppfe
List of original commits: