Skip to content

Commit 66b8145

Browse files
zesmingzesming
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: mediatek: fix mt7981 clk clock support mediatek: add filogic 820 (MT7981) subtarget support kernel: modules: package Marvell gigE PHY driver uboot-mediatek: optimize MMC erase tools: update versions (coolsnowwolf#10444) kernel: bump 5.15 to 5.15.79 (coolsnowwolf#10441) kernel: bump 5.10 to 5.10.155 (coolsnowwolf#10443) libnetfilter-conntrack: bump to 1.0.9 (coolsnowwolf#10442) ipq60xx: sync patches from upstream Update README.md netsupport.mk: fix rxrpc dependence ipq6000: add usb3 DT description kernel: bump 6.0 to 6.0.9 (coolsnowwolf#10429)
2 parents 6624ac9 + a01f34b commit 66b8145

File tree

76 files changed

+3822
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3822
-88
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Op固件技术研究群 ,号码 891659613 ，加群链接：[点击加入](https
99
2. TG 讨论群： OP 编译官方大群 ，加群链接：[点击加入](https://t.me/JhKgAA6Hx1 "OP 编译官方大群")
1010
3. Rockchip RK3568 预编译固件发布 Release 下载更新地址 (包括 H68K )：<https://github.com/coolsnowwolf/lede/releases/tag/20220716>
1111

12-
<img src="https://github.com/coolsnowwolf/lede/blob/master/doc/h68k.jpg?raw=true" width=600 />
12+
<a href ="https://item.taobao.com/item.htm?spm=a230r.1.14.26.4bb55247bX9SiV&id=692981063139&ns=1&abbucket=15#detail"><img src="https://github.com/coolsnowwolf/lede/blob/master/doc/h68k.jpg?raw=true" width=600 /></a>
1313

1414
## 注意
1515

‎doc/h68k.jpg

7.67 KB
Loading

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .154
2-
LINUX_KERNEL_HASH-5.10.154 = c6ae3d4da4324933160260d0f092a40cd27f9ed03449380790afbe6ce91ee688
1+
LINUX_VERSION-5.10 = .155
2+
LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .78
2-
LINUX_KERNEL_HASH-5.15.78 = 0db99f7347a38c27b8c155f3c9c8b260011aea0a4ded85ee95e6095b1e69a499
1+
LINUX_VERSION-5.15 = .79
2+
LINUX_KERNEL_HASH-5.15.79 = cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154

‎include/kernel-6.0

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.0 = .8
2-
LINUX_KERNEL_HASH-6.0.8 = 0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257
1+
LINUX_VERSION-6.0 = .9
2+
LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7

‎package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
+emmc_read_recovery=mmc dev 0 0 ; part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
199199
+mmc_write_production=if test "$bootedfrom" = "SD" ; then run sdmmc_write_production ; else run emmc_write_production ; fi
200200
+mmc_write_recovery=if test "$bootedfrom" = "SD" ; run sdmmc_write_recovery ; else run emmc_write_recovery ; fi
201-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
201+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
202202
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
203203
+reset_factory=eraseenv && reset
204204
+sdmmc_read_emmc_hdr=mmc dev 1 && mmc read $loadaddr 0x1ff8 0x8

‎package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
+emmc_write_recovery=mmc dev 0 0 ; iminfo $loadaddr && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
197197
+emmc_read_production=mmc dev 0 0 ; part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
198198
+emmc_read_recovery=mmc dev 0 0 ; part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
199-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
199+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
200200
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
201201
+reset_factory=eraseenv && reset
202202
+_init_env=setenv _init_env ; saveenv ; saveenv

‎package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
+emmc_write_hdr=mmc dev 0 0 && mmc erase 0x0 0x40 && mmc write $loadaddr 0x0 0x40
215215
+emmc_write_production=mmc dev 0 && part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
216216
+emmc_write_recovery=mmc dev 0 && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
217-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
217+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
218218
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
219219
+part_default=production
220220
+part_recovery=recovery
@@ -444,7 +444,7 @@
444444
+emmc_write_fip=mmc dev 0 0 && mmc erase 0x1000 0x1000 && mmc write $loadaddr 0x1000 0x1000 && mmc erase 0x2000 0x800
445445
+emmc_read_production=mmc dev 0 && part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
446446
+emmc_read_recovery=mmc dev 0 && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
447-
+mmc_write_vol=imszb $fileaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $fileaddr 0x$part_addr 0x$image_size
447+
+mmc_write_vol=imszb $fileaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $fileaddr 0x$part_addr 0x$image_size
448448
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size
449449
+part_default=production
450450
+part_recovery=recovery

‎package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@
11391139
+boot_tftp_production=run boot_update_conf ; tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run sdmmc_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
11401140
+boot_tftp_recovery=run boot_update_conf ; tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run sdmmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
11411141
+boot_tftp=run boot_update_conf ; tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
1142-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
1142+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
11431143
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
11441144
+part_default=production
11451145
+part_recovery=recovery
@@ -1294,7 +1294,7 @@
12941294
+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
12951295
+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
12961296
+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
1297-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
1297+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
12981298
+emmc_init=mmc dev 0 && mmc bootbus 0 0 0 0 && run emmc_init_bl && run emmc_init_openwrt ; env default bootcmd ; saveenv ; saveenv
12991299
+emmc_init_bl=run ubi_read_emmc_install && setenv fileaddr $loadaddr && run emmc_write_bl2 && setexpr fileaddr $loadaddr + 0x100000 && run emmc_write_fip && setexpr fileaddr $loadaddr + 0x500000 && run emmc_write_hdr
13001300
+emmc_init_openwrt=run ubi_read_recovery && iminfo $loadaddr && run emmc_write_recovery ; run ubi_read_production && iminfo $loadaddr && run emmc_write_production
@@ -1351,7 +1351,7 @@
13511351
+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2
13521352
+boot_tftp=run boot_update_conf ; tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
13531353
+boot_update_conf=if nand info ; then setenv bootconf config-mt7986a-bananapi-bpi-r3-emmc-snand ; else setenv bootconf config-mt7986a-bananapi-bpi-r3-emmc-nor ; fi
1354-
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
1354+
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
13551355
+mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
13561356
+part_default=production
13571357
+part_recovery=recovery

‎package/kernel/linux/modules/netdevices.mk

+34
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,40 @@ endef
244244
$(eval $(call KernelPackage,phy-bcm84881))
245245

246246

247+
define KernelPackage/phy-marvell
248+
SUBMENU:=$(NETWORK_DEVICES_MENU)
249+
TITLE:=Marvell Gigabit Ethernet PHY driver
250+
KCONFIG:=CONFIG_MARVELL_PHY
251+
DEPENDS:=+kmod-libphy
252+
FILES:=$(LINUX_DIR)/drivers/net/phy/marvell.ko
253+
AUTOLOAD:=$(call AutoLoad,18,marvell)
254+
endef
255+
256+
define KernelPackage/phy-marvell/description
257+
Supports Marvell Gigabit Ethernet PHYs:
258+
* 88E1101
259+
* 88E1112
260+
* 88E1111 (incl. Finisar variant)
261+
* 88E1118
262+
* 88E1121R
263+
* 88E1145
264+
* 88E1149R
265+
* 88E1240
266+
* 88E1318S
267+
* 88E1116R
268+
* 88E1510
269+
* 88E1540
270+
* 88E1545
271+
* 88E3016
272+
* 88E6341 family
273+
* 88E6390 family
274+
* 88E6393 family
275+
* 88E1340S
276+
* 88E1548P
277+
endef
278+
279+
$(eval $(call KernelPackage,phy-marvell))
280+
247281

248282
define KernelPackage/phy-realtek
249283
SUBMENU:=$(NETWORK_DEVICES_MENU)

‎package/kernel/linux/modules/netsupport.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1137,6 +1137,12 @@ $(eval $(call KernelPackage,dnsresolver))
11371137
define KernelPackage/rxrpc
11381138
SUBMENU:=$(NETWORK_SUPPORT_MENU)
11391139
TITLE:=AF_RXRPC support
1140+
DEPENDS:= \
1141+
+kmod-crypto-manager \
1142+
+kmod-crypto-pcbc \
1143+
+kmod-crypto-fcrypt \
1144+
+kmod-udptunnel4 \
1145+
+IPV6:kmod-udptunnel6
11401146
HIDDEN:=1
11411147
KCONFIG:= \
11421148
CONFIG_AF_RXRPC \
@@ -1145,7 +1151,6 @@ define KernelPackage/rxrpc
11451151
FILES:= \
11461152
$(LINUX_DIR)/net/rxrpc/rxrpc.ko
11471153
AUTOLOAD:=$(call AutoLoad,30,rxrpc.ko)
1148-
DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt
11491154
endef
11501155

11511156
define KernelPackage/rxrpc/description

‎package/libs/libnetfilter-conntrack/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=libnetfilter_conntrack
11-
PKG_VERSION:=1.0.8
12-
PKG_RELEASE:=1
11+
PKG_VERSION:=1.0.9
12+
PKG_RELEASE:=2
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
1515
PKG_SOURCE_URL:=https://www.netfilter.org/projects/libnetfilter_conntrack/files
16-
PKG_HASH:=0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf
16+
PKG_HASH:=67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8
1717

1818
PKG_MAINTAINER:=Jo-Philipp Wich <[email protected]>
1919
PKG_LICENSE:=GPL-2.0-or-later

‎package/libs/libnetfilter-conntrack/patches/0001-conntrack-fix-build-with-kernel-5_15-and-musl.patch

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001
2+
From: Robert Marko <[email protected]>
3+
Date: Thu, 24 Feb 2022 15:01:11 +0100
4+
Subject: conntrack: fix build with kernel 5.15 and musl
5+
6+
Currently, with kernel 5.15 headers and musl building is failing with
7+
redefinition errors due to a conflict between the kernel and musl headers.
8+
9+
Musl is able to suppres the conflicting kernel header definitions if they
10+
are included after the standard libc ones, however since ICMP definitions
11+
were moved into a separate internal header to avoid duplication this has
12+
stopped working and is breaking the builds.
13+
14+
It seems that the issue is that <netinet/in.h> which contains the UAPI
15+
suppression defines is included in the internal.h header and not in the
16+
proto.h which actually includes the kernel ICMP headers and thus UAPI
17+
supression defines are not present.
18+
19+
Solve this by moving the <netinet/in.h> include before the ICMP kernel
20+
includes in the proto.h
21+
22+
Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
23+
Signed-off-by: Robert Marko <[email protected]>
24+
Signed-off-by: Florian Westphal <[email protected]>
25+
---
26+
include/internal/internal.h | 1 -
27+
include/internal/proto.h | 1 +
28+
2 files changed, 1 insertion(+), 1 deletion(-)
29+
30+
--- a/include/internal/internal.h
31+
+++ b/include/internal/internal.h
32+
@@ -14,7 +14,6 @@
33+
#include <arpa/inet.h>
34+
#include <time.h>
35+
#include <errno.h>
36+
-#include <netinet/in.h>
37+
38+
#include <libnfnetlink/libnfnetlink.h>
39+
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
40+
--- a/include/internal/proto.h
41+
+++ b/include/internal/proto.h
42+
@@ -2,6 +2,7 @@
43+
#define _NFCT_PROTO_H_
44+
45+
#include <stdint.h>
46+
+#include <netinet/in.h>
47+
#include <linux/icmp.h>
48+
#include <linux/icmpv6.h>
49+

‎target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
1616

1717
--- a/sound/usb/quirks.c
1818
+++ b/sound/usb/quirks.c
19-
@@ -1883,6 +1883,8 @@ static const struct usb_audio_quirk_flag
19+
@@ -1884,6 +1884,8 @@ static const struct usb_audio_quirk_flag
2020
QUIRK_FLAG_GENERIC_IMPLICIT_FB),
2121
DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
2222
QUIRK_FLAG_GENERIC_IMPLICIT_FB),

‎target/linux/bcm27xx/patches-5.15/950-0471-sound-usb-call-usb_autopm_get_interface-for-devices-.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
1919

2020
--- a/sound/usb/card.c
2121
+++ b/sound/usb/card.c
22-
@@ -843,8 +843,14 @@ static int usb_audio_probe(struct usb_in
22+
@@ -855,8 +855,14 @@ static int usb_audio_probe(struct usb_in
2323
if (ignore_ctl_error)
2424
chip->quirk_flags |= QUIRK_FLAG_IGNORE_CTL_ERROR;
2525

‎target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -775,15 +775,15 @@ Signed-off-by: David S. Miller <[email protected]>
775775
/* bring up the dma engine and IP core */
776776
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
777777
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
778-
@@ -2700,7 +2700,6 @@ static int mv643xx_eth_shared_of_add_por
778+
@@ -2701,7 +2701,6 @@ static int mv643xx_eth_shared_of_add_por
779779
struct platform_device *ppdev;
780780
struct mv643xx_eth_platform_data ppd;
781781
struct resource res;
782782
- const char *mac_addr;
783783
int ret;
784784
int dev_num = 0;
785785

786-
@@ -2731,9 +2730,7 @@ static int mv643xx_eth_shared_of_add_por
786+
@@ -2732,9 +2731,7 @@ static int mv643xx_eth_shared_of_add_por
787787
return -EINVAL;
788788
}
789789

@@ -1250,7 +1250,7 @@ Signed-off-by: David S. Miller <[email protected]>
12501250

12511251
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
12521252
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
1253-
@@ -372,7 +372,7 @@ static int meson8b_dwmac_probe(struct pl
1253+
@@ -370,7 +370,7 @@ static int meson8b_dwmac_probe(struct pl
12541254
if (ret)
12551255
return ret;
12561256

@@ -1455,15 +1455,15 @@ Signed-off-by: David S. Miller <[email protected]>
14551455
of_node_put(node);
14561456
--- a/drivers/net/ethernet/ti/cpsw.c
14571457
+++ b/drivers/net/ethernet/ti/cpsw.c
1458-
@@ -1306,7 +1306,6 @@ static int cpsw_probe_dt(struct cpsw_pla
1458+
@@ -1308,7 +1308,6 @@ static int cpsw_probe_dt(struct cpsw_pla
14591459

14601460
for_each_available_child_of_node(node, slave_node) {
14611461
struct cpsw_slave_data *slave_data = data->slave_data + i;
14621462
- const void *mac_addr = NULL;
14631463
int lenp;
14641464
const __be32 *parp;
14651465

1466-
@@ -1378,10 +1377,8 @@ static int cpsw_probe_dt(struct cpsw_pla
1466+
@@ -1380,10 +1379,8 @@ static int cpsw_probe_dt(struct cpsw_pla
14671467
}
14681468

14691469
no_phy_slave:

‎target/linux/generic/hack-5.10/221-module_exports.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
3030
/* Align . to a 8 byte boundary equals to maximum function alignment. */
3131
#define ALIGN_FUNCTION() . = ALIGN(8)
3232

33-
@@ -473,14 +483,14 @@
33+
@@ -474,14 +484,14 @@
3434
/* Kernel symbol table: Normal symbols */ \
3535
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
3636
__start___ksymtab = .; \
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
4747
__stop___ksymtab_gpl = .; \
4848
} \
4949
\
50-
@@ -542,7 +552,7 @@
50+
@@ -543,7 +553,7 @@
5151
\
5252
/* Kernel symbol table: strings */ \
5353
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \

‎target/linux/generic/hack-5.15/221-module_exports.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
3030
/* Align . to a 8 byte boundary equals to maximum function alignment. */
3131
#define ALIGN_FUNCTION() . = ALIGN(8)
3232

33-
@@ -484,14 +494,14 @@
33+
@@ -485,14 +495,14 @@
3434
/* Kernel symbol table: Normal symbols */ \
3535
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
3636
__start___ksymtab = .; \
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
4747
__stop___ksymtab_gpl = .; \
4848
} \
4949
\
50-
@@ -511,7 +521,7 @@
50+
@@ -512,7 +522,7 @@
5151
\
5252
/* Kernel symbol table: strings */ \
5353
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \

‎target/linux/generic/hack-6.0/221-module_exports.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
3030
/* Align . to a 8 byte boundary equals to maximum function alignment. */
3131
#define ALIGN_FUNCTION() . = ALIGN(8)
3232

33-
@@ -478,14 +488,14 @@
33+
@@ -479,14 +489,14 @@
3434
/* Kernel symbol table: Normal symbols */ \
3535
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
3636
__start___ksymtab = .; \
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
4747
__stop___ksymtab_gpl = .; \
4848
} \
4949
\
50-
@@ -505,7 +515,7 @@
50+
@@ -506,7 +516,7 @@
5151
\
5252
/* Kernel symbol table: strings */ \
5353
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \

‎target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -363,15 +363,15 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
363363
return 0;
364364
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
365365
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
366-
@@ -491,6 +491,7 @@ static int
366+
@@ -494,6 +494,7 @@ static int
367367
mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f)
368368
{
369369
struct mtk_flow_entry *entry;
370370
+ struct mtk_foe_accounting diff;
371371
u32 idle;
372372

373373
entry = rhashtable_lookup(&eth->flow_table, &f->cookie,
374-
@@ -501,6 +502,12 @@ mtk_flow_offload_stats(struct mtk_eth *e
374+
@@ -504,6 +505,12 @@ mtk_flow_offload_stats(struct mtk_eth *e
375375
idle = mtk_foe_entry_idle_time(eth->ppe[entry->ppe_index], entry);
376376
f->stats.lastused = jiffies - idle * HZ;
377377

‎target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-mr7350.dts

+13-1
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,23 @@
206206
};
207207
};
208208

209+
&qusb_phy_0 {
210+
status = "okay";
211+
};
212+
213+
&ssphy_0 {
214+
status = "okay";
215+
};
216+
217+
&usb3 {
218+
status = "okay";
219+
};
220+
209221
&wifi {
210222
status = "okay";
211223
};
212224

213-
&i2c_1 {
225+
&blsp1_i2c3 {
214226
pinctrl-0 = <&i2c_1_pins>;
215227
pinctrl-names = "default";
216228
status = "okay";

‎target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-v6.dts

+4
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@
236236
status = "okay";
237237
};
238238

239+
&ssphy_0 {
240+
status = "ok";
241+
};
242+
239243
&qusb_phy_0 {
240244
status = "ok";
241245
};

0 commit comments

Comments
 (0)