Skip to content

Commit 32f489d

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: rockchip：add doornet2 lpddr4 4gb (coolsnowwolf#9817) kernel: bump 5.18 to 5.18.14 (coolsnowwolf#9823) kernel: bump 5.15 to 5.15.57 (coolsnowwolf#9824)
2 parents 81195e5 + eb3ebc4 commit 32f489d

20 files changed

+185
-19
lines changed

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .56
2-
LINUX_KERNEL_HASH-5.15.56 = e9a6bb3437f1497b1c74841ebf70d5b96f915d6ac767b5ba3d8d820dd89b8223
1+
LINUX_VERSION-5.15 = .57
2+
LINUX_KERNEL_HASH-5.15.57 = 62e3095a1fc876315150c93aad1546cc198e3ba5863b3d7ff7da21fbee20f0fd

‎include/kernel-5.18

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.18 = .13
2-
LINUX_KERNEL_HASH-5.18.13 = 430e1affe62fcca274f217b150290995a33ceb0d5ad5e72ca6ee8a2d28276bda
1+
LINUX_VERSION-5.18 = .14
2+
LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af

‎package/boot/uboot-rockchip/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ define U-Boot/guangmiao-g4c-rk3399
9797
BUILD_SUBTARGET:=armv8
9898
NAME:=GuangMiao G4C
9999
BUILD_DEVICES:= \
100-
sharevdi_guangmiao-g4c
100+
sharevdi_guangmiao-g4c \
101+
embedfire_doornet2-4gb
101102
DEPENDS:=+PACKAGE_u-boot-guangmiao-g4c-rk3399:arm-trusted-firmware-rockchip
102103
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
103104
ATF:=rk3399_bl31.elf

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
115115
.previous
116116
--- a/scripts/Makefile.build
117117
+++ b/scripts/Makefile.build
118-
@@ -396,7 +396,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
118+
@@ -397,7 +397,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
119119
# Linker scripts preprocessor (.lds.S -> .lds)
120120
# ---------------------------------------------------------------------------
121121
quiet_cmd_cpp_lds_S = LDS $@

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
9191
"__kstrtabns_" #sym ": \n" \
9292
--- a/scripts/Makefile.build
9393
+++ b/scripts/Makefile.build
94-
@@ -395,7 +395,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
94+
@@ -396,7 +396,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa
9595
# Linker scripts preprocessor (.lds.S -> .lds)
9696
# ---------------------------------------------------------------------------
9797
quiet_cmd_cpp_lds_S = LDS $@

‎target/linux/generic/pending-5.15/201-extra_optimization.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1414

1515
--- a/Makefile
1616
+++ b/Makefile
17-
@@ -752,11 +752,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
17+
@@ -759,11 +759,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
1818
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
1919

2020
ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE

‎target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
106106
}
107107
--- a/scripts/link-vmlinux.sh
108108
+++ b/scripts/link-vmlinux.sh
109-
@@ -263,6 +263,10 @@ kallsyms()
109+
@@ -266,6 +266,10 @@ kallsyms()
110110
kallsymopt="${kallsymopt} --base-relative"
111111
fi
112112

‎target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
106106
}
107107
--- a/scripts/link-vmlinux.sh
108108
+++ b/scripts/link-vmlinux.sh
109-
@@ -264,6 +264,10 @@ kallsyms()
109+
@@ -267,6 +267,10 @@ kallsyms()
110110
kallsymopt="${kallsymopt} --base-relative"
111111
fi
112112

‎target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ Signed-off-by: Frank Wunderlich <[email protected]>
2121
+ .offload_version = 2,
2222
.txrx = {
2323
.txd_size = sizeof(struct mtk_tx_dma),
24-
.rxd_size = sizeof(struct mtk_rx_dma),
24+
.rxd_size = sizeof(struct mtk_rx_dma),

‎target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "rk3399-doornet2.dtsi"
55

66
/ {
7-
model = "EmbedFire DoorNet2";
7+
model = "EmbedFire DoorNet2 1GB";
88
compatible = "embedfire,doornet2", "rockchip,rk3399";
99

1010
aliases {

‎target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-doornet2-4gb.dts

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
/dts-v1/;
4+
#include "rk3399-doornet2.dtsi"
5+
6+
/ {
7+
model = "EmbedFire DoorNet2-4GB";
8+
compatible = "embedfire,doornet2", "rockchip,rk3399";
9+
10+
aliases {
11+
led-boot = &sys_led;
12+
led-failsafe = &sys_led;
13+
led-running = &sys_led;
14+
led-upgrade = &sys_led;
15+
};
16+
17+
/delete-node/ display-subsystem;
18+
19+
gpio-leds {
20+
pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
21+
22+
/delete-node/ status;
23+
24+
lan_led: led-lan {
25+
gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
26+
label = "green:lan";
27+
};
28+
29+
sys_led: led-sys {
30+
gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
31+
label = "red:sys";
32+
default-state = "on";
33+
};
34+
35+
wan_led: led-wan {
36+
gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
37+
label = "green:wan";
38+
};
39+
};
40+
41+
gpio-keys {
42+
pinctrl-0 = <&reset_button_pin>;
43+
44+
/delete-node/ power;
45+
46+
reset {
47+
debounce-interval = <50>;
48+
gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
49+
label = "reset";
50+
linux,code = <KEY_RESTART>;
51+
};
52+
};
53+
54+
vdd_5v: vdd-5v {
55+
compatible = "regulator-fixed";
56+
regulator-name = "vdd_5v";
57+
regulator-always-on;
58+
regulator-boot-on;
59+
};
60+
};
61+
62+
&pcie0 {
63+
max-link-speed = <1>;
64+
num-lanes = <1>;
65+
vpcie3v3-supply = <&vcc3v3_sys>;
66+
67+
pcie@0 {
68+
reg = <0x00000000 0 0 0 0>;
69+
#address-cells = <3>;
70+
#size-cells = <2>;
71+
72+
pcie-eth@0,0 {
73+
compatible = "realtek,r8168";
74+
reg = <0x000000 0 0 0 0>;
75+
76+
realtek,led-data = <0x870>;
77+
};
78+
};
79+
};
80+
81+
&pinctrl {
82+
gpio-leds {
83+
/delete-node/ leds-gpio;
84+
85+
lan_led_pin: lan-led-pin {
86+
rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
87+
};
88+
89+
sys_led_pin: sys-led-pin {
90+
rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
91+
};
92+
93+
wan_led_pin: wan-led-pin {
94+
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
95+
};
96+
};
97+
98+
rockchip-key {
99+
/delete-node/ power-key;
100+
101+
reset_button_pin: reset-button-pin {
102+
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
103+
};
104+
};
105+
};
106+
107+
&u2phy0_host {
108+
phy-supply = <&vdd_5v>;
109+
};
110+
111+
&vcc3v3_sys {
112+
vin-supply = <&vcc5v0_sys>;
113+
};

‎target/linux/rockchip/image/armv8.mk

+11-1
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,24 @@ TARGET_DEVICES += embedfire_doornet1
1414

1515
define Device/embedfire_doornet2
1616
DEVICE_VENDOR := EmbedFire
17-
DEVICE_MODEL := DoorNet2
17+
DEVICE_MODEL := DoorNet2 1GB
1818
SOC := rk3399
1919
UBOOT_DEVICE_NAME := doornet2-rk3399
2020
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata
2121
DEVICE_PACKAGES := kmod-r8168 -urngd
2222
endef
2323
TARGET_DEVICES += embedfire_doornet2
2424

25+
define Device/embedfire_doornet2-4gb
26+
DEVICE_VENDOR := EmbedFire
27+
DEVICE_MODEL := DoorNet2 4GB
28+
SOC := rk3399
29+
UBOOT_DEVICE_NAME := guangmiao-g4c-rk3399
30+
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata
31+
DEVICE_PACKAGES := kmod-r8168 -urngd
32+
endef
33+
TARGET_DEVICES += embedfire_doornet2-4gb
34+
2535
define Device/friendlyarm_nanopi-neo3
2636
DEVICE_VENDOR := FriendlyARM
2737
DEVICE_MODEL := NanoPi NEO3

‎target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
+#include "rk3399-doornet2.dtsi"
1818
+
1919
+/ {
20-
+ model = "EmbedFire DoorNet2";
20+
+ model = "EmbedFire DoorNet2 1GB";
2121
+ compatible = "embedfire,doornet2", "rockchip,rk3399";
2222
+
2323
+ aliases {

‎target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch

+12
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,15 @@ Signed-off-by: wevsty <[email protected]>
4343
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
4444
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
4545
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
46+
47+
--- a/arch/arm64/boot/dts/rockchip/Makefile
48+
+++ b/arch/arm64/boot/dts/rockchip/Makefile
49+
@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
50+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
51+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
52+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
53+
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
54+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
55+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
56+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
57+

‎target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
+#include "rk3399-doornet2.dtsi"
1818
+
1919
+/ {
20-
+ model = "EmbedFire DoorNet2";
20+
+ model = "EmbedFire DoorNet2 1GB";
2121
+ compatible = "embedfire,doornet2", "rockchip,rk3399";
2222
+
2323
+ aliases {

‎target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch

+12
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,15 @@
88
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
99
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
1010
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
11+
12+
--- a/arch/arm64/boot/dts/rockchip/Makefile
13+
+++ b/arch/arm64/boot/dts/rockchip/Makefile
14+
@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
15+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
16+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
17+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
18+
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
19+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
20+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
21+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
22+

‎target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@
1313

1414
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
1515
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
16-
@@ -498,6 +498,11 @@ int stmmac_mdio_register(struct net_devi
16+
@@ -498,6 +498,16 @@ int stmmac_mdio_register(struct net_devi
1717
if (priv->plat->has_xgmac)
1818
stmmac_xgmac2_mdio_read(new_bus, 0, MII_ADDR_C45);
1919

20+
+ stmmac_mdio_write(new_bus,0,31,2627);
21+
+ stmmac_mdio_write(new_bus,0,25,0x1801);
22+
+ stmmac_mdio_write(new_bus,0,31,0);
23+
+ stmmac_mdio_write(new_bus,0,0,0x8000);
24+
+
2025
+ stmmac_mdio_write(new_bus,0,31,2627);
2126
+ stmmac_mdio_write(new_bus,0,25,0x1801);
2227
+ stmmac_mdio_write(new_bus,0,31,0);

‎target/linux/rockchip/patches-5.18/900-arm-boot-add-dts-files.patch

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
1414
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
1515
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
16-
@@ -22,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-or
16+
@@ -22,6 +26,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-or
1717
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
1818
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
1919
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
2020
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
21+
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
2122
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
2223
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
2324
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
24-
@@ -40,6 +45,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-na
25+
@@ -40,6 +46,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-na
2526
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb
2627
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
2728
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb

‎target/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
+#include "rk3399-doornet2.dtsi"
1818
+
1919
+/ {
20-
+ model = "EmbedFire DoorNet2";
20+
+ model = "EmbedFire DoorNet2 1GB";
2121
+ compatible = "embedfire,doornet2", "rockchip,rk3399";
2222
+
2323
+ aliases {

‎target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch

+12
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,15 @@ Signed-off-by: wevsty <[email protected]>
4343
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
4444
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
4545
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
46+
47+
--- a/arch/arm64/boot/dts/rockchip/Makefile
48+
+++ b/arch/arm64/boot/dts/rockchip/Makefile
49+
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
50+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
51+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
52+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb
53+
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb
54+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
55+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
56+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
57+

0 commit comments

Comments
 (0)