[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: Update README.md luci-app-qbittorrent-simple: move to `luci` feeds (coolsnowwolf#10606) rockchip: fix radxa e25 adc-keys power button support mac80211: backports linux 6.1 support ksmbd: fixes build on kernel 6.1 rockchip: add kernel 6.1 support rockchip: correct board name for radxa e25 kernel: fix build fail with zstd
finalpi · Dec 13, 2022 · 70aea24 · 70aea24
2 parents 914cbf7 + 9185096
commit 70aea24
Show file tree

Hide file tree

Showing 97 changed files with 451 additions and 7,625 deletions.
diff --git a/README.md b/README.md
@@ -134,6 +134,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 iKOOLCORE 硬酷R1 多网口小主机 - N5105/N6005 : Cube box, rest fun. 方寸之间，尽享乐趣
 
 (商品介绍页面 - 硬酷科技（支持花呗）)：
+[优惠券链接](https://taoquan.taobao.com/coupon/unify_apply.htm?sellerId=2208215115814&activityId=85fbaf791c4b45e9aaf5ec8e3d1cb2a9)
 [下单链接](https://item.taobao.com/item.htm?ft=t&id=682987219699)
 
 [![r1](doc/r1.jpg)](https://item.taobao.com/item.htm?ft=t&id=682025492099)

diff --git a/doc/r1.jpg b/doc/r1.jpg
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
@@ -170,23 +170,23 @@ define U-Boot/opc-h68k-rk3568
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
 endef
 
-define U-Boot/rock-3a-rk3568
+define U-Boot/radxa-e25-rk3568
   BUILD_SUBTARGET:=armv8
-  NAME:=ROCK3 Model A
+  NAME:=Radxa E25
   BUILD_DEVICES:= \
-    radxa_rock-3a
-  DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
+    radxa_e25
+  DEPENDS:=+PACKAGE_u-boot-radxa-e25-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
 endef
 
-define U-Boot/rock-pi-e25-rk3568
+define U-Boot/rock-3a-rk3568
   BUILD_SUBTARGET:=armv8
-  NAME:=ROCK Pi E25
+  NAME:=ROCK3 Model A
   BUILD_DEVICES:= \
-    radxa_rock-pi-e25
-  DEPENDS:=+PACKAGE_u-boot-rock-pi-e25-rk3568:arm-trusted-firmware-rk3568
+    radxa_rock-3a
+  DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
@@ -218,8 +218,8 @@ endef
 UBOOT_TARGETS := \
   mrkaio-m68s-rk3568 \
   opc-h68k-rk3568 \
+  radxa-e25-rk3568 \
   rock-3a-rk3568 \
-  rock-pi-e25-rk3568 \
   r66s-rk3568 \
   station-p2-rk3568 \
   guangmiao-g4c-rk3399 \

diff --git a/...ge/boot/uboot-rockchip/patches/302-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch b/...ge/boot/uboot-rockchip/patches/302-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch
@@ -14,7 +14,7 @@
 +#include "rk3328-nanopi-r2s-u-boot.dtsi"
 --- /dev/null
 +++ b/arch/arm/dts/rk3328-orangepi-r1-plus.dts
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,25 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +#include "rk3328-nanopi-r2s.dts"
 +
@@ -23,86 +23,59 @@
 +	compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328";
 +};
 +
-+&lan_led {
-+	label = "orangepi-r1-plus:green:lan";
-+};
-+
 +&spi0 {
 +	status = "okay";
 +
 +	flash@0 {
 +		compatible = "jedec,spi-nor";
 +		reg = <0>;
-+		spi-max-frequency = <10000000>;
++		spi-max-frequency = <50000000>;
 +	};
 +};
 +
 +&sys_led {
 +	gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
-+	label = "orangepi-r1-plus:red:sys";
 +};
 +
 +&sys_led_pin {
 +	rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 +};
-+
-+&uart1 {
-+	status = "okay";
-+};
-+
-+&wan_led {
-+	label = "orangepi-r1-plus:green:wan";
-+};
---- a/board/rockchip/evb_rk3328/MAINTAINERS
-+++ b/board/rockchip/evb_rk3328/MAINTAINERS
-@@ -12,6 +12,13 @@ F:      configs/nanopi-r2s-rk3328_defconfig
- F:      arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
- F:      arch/arm/dts/rk3328-nanopi-r2s.dts
-
-+ORANGEPI-R1-PLUS-RK3328
-+M:      Shenzhen Xunlong Software CO.,Limited <zhao_steven@263.net>
-+S:      Maintained
-+F:      configs/orangepi-r1-plus-rk3328_defconfig
-+F:      arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
-+F:      arch/arm/dts/rk3328-orangepi-r1-plus.dts
-+
- ROC-RK3328-CC
- M:      Loic Devulder <ldevulder@suse.com>
- M:      Chen-Yu Tsai <wens@csie.org>
 --- /dev/null
 +++ b/configs/orangepi-r1-plus-rk3328_defconfig
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,104 @@
 +CONFIG_ARM=y
++CONFIG_SKIP_LOWLEVEL_INIT=y
++CONFIG_COUNTER_FREQUENCY=24000000
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_SYS_TEXT_BASE=0x00200000
-+CONFIG_SPL_GPIO_SUPPORT=y
++CONFIG_SPL_GPIO=y
++CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_OFFSET=0x3F8000
++CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus"
 +CONFIG_ROCKCHIP_RK3328=y
 +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
 +CONFIG_TPL_LIBCOMMON_SUPPORT=y
 +CONFIG_TPL_LIBGENERIC_SUPPORT=y
-+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
++CONFIG_SPL_DRIVERS_MISC=y
 +CONFIG_SPL_STACK_R_ADDR=0x600000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_SYS_LOAD_ADDR=0x800800
 +CONFIG_DEBUG_UART_BASE=0xFF130000
 +CONFIG_DEBUG_UART_CLOCK=24000000
-+CONFIG_SYSINFO=y
++CONFIG_SYS_LOAD_ADDR=0x800800
 +CONFIG_DEBUG_UART=y
 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
 +# CONFIG_ANDROID_BOOT_IMAGE is not set
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb"
-+CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
++CONFIG_MISC_INIT_R=y
 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 +CONFIG_TPL_SYS_MALLOC_SIMPLE=y
 +CONFIG_SPL_STACK_R=y
-+CONFIG_SPL_I2C_SUPPORT=y
-+CONFIG_SPL_POWER_SUPPORT=y
++CONFIG_SPL_I2C=y
++CONFIG_SPL_POWER=y
 +CONFIG_SPL_ATF=y
 +CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 +CONFIG_CMD_BOOTZ=y
@@ -113,11 +86,11 @@
 +CONFIG_CMD_TIME=y
 +CONFIG_SPL_OF_CONTROL=y
 +CONFIG_TPL_OF_CONTROL=y
-+CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus"
 +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 +CONFIG_TPL_OF_PLATDATA=y
 +CONFIG_ENV_IS_IN_MMC=y
 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
++CONFIG_SYS_MMC_ENV_DEV=1
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_TPL_DM=y
 +CONFIG_REGMAP=y
@@ -142,6 +115,7 @@
 +CONFIG_SPL_PINCTRL=y
 +CONFIG_DM_PMIC=y
 +CONFIG_PMIC_RK8XX=y
++CONFIG_SPL_PMIC_RK8XX=y
 +CONFIG_SPL_DM_REGULATOR=y
 +CONFIG_REGULATOR_PWM=y
 +CONFIG_DM_REGULATOR_FIXED=y
@@ -154,6 +128,7 @@
 +CONFIG_DM_RESET=y
 +CONFIG_BAUDRATE=1500000
 +CONFIG_DEBUG_UART_SHIFT=2
++CONFIG_SYSINFO=y
 +CONFIG_SYSRESET=y
 +# CONFIG_TPL_SYSRESET is not set
 +CONFIG_USB=y

diff --git a/...oot/uboot-rockchip/patches/303-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus-LTS.patch b/...oot/uboot-rockchip/patches/303-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus-LTS.patch
@@ -11,8 +11,6 @@ Subject: [PATCH] Add support for Orangepi R1 Plus LTS
  create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
  create mode 100644 configs/orangepi-r1-plus-lts-rk3328_defconfig
 
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index adfe6c3f..3d4e0f59 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -110,6 +110,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3328) += \
@@ -23,9 +21,10 @@ index adfe6c3f..3d4e0f59 100644
  	rk3328-roc-cc.dtb \
  	rk3328-rock64.dtb \
  	rk3328-rock-pi-e.dtb
-diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts b/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
-new file mode 100644
-index 00000000..e6225b0c
+--- /dev/null
++++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
+@@ -0,0 +1,1 @@
++#include "rk3328-nanopi-r2s-u-boot.dtsi"
 --- /dev/null
 +++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
 @@ -0,0 +1,7 @@
@@ -36,27 +35,26 @@ index 00000000..e6225b0c
 +	model = "Xunlong Orange Pi R1 Plus LTS";
 +	compatible = "xunlong,orangepi-r1-plus-lts", "rockchip,rk3328";
 +};
-diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig b/configs/orangepi-r1-plus-lts-rk3328_defconfig
-new file mode 100644
-index 00000000..3cb3b5c3
 --- /dev/null
 +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,104 @@
 +CONFIG_ARM=y
++CONFIG_SKIP_LOWLEVEL_INIT=y
++CONFIG_COUNTER_FREQUENCY=24000000
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_SYS_TEXT_BASE=0x00200000
-+CONFIG_SPL_GPIO_SUPPORT=y
++CONFIG_SPL_GPIO=y
++CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_OFFSET=0x3F8000
++CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus-lts"
 +CONFIG_ROCKCHIP_RK3328=y
 +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
 +CONFIG_TPL_LIBCOMMON_SUPPORT=y
 +CONFIG_TPL_LIBGENERIC_SUPPORT=y
-+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
++CONFIG_SPL_DRIVERS_MISC=y
 +CONFIG_SPL_STACK_R_ADDR=0x600000
-+CONFIG_NR_DRAM_BANKS=1
 +CONFIG_DEBUG_UART_BASE=0xFF130000
 +CONFIG_DEBUG_UART_CLOCK=24000000
-+CONFIG_SYSINFO=y
 +CONFIG_SYS_LOAD_ADDR=0x800800
 +CONFIG_DEBUG_UART=y
 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
@@ -65,14 +63,14 @@ index 00000000..3cb3b5c3
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb"
-+CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
++CONFIG_MISC_INIT_R=y
 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 +CONFIG_TPL_SYS_MALLOC_SIMPLE=y
 +CONFIG_SPL_STACK_R=y
-+CONFIG_SPL_I2C_SUPPORT=y
-+CONFIG_SPL_POWER_SUPPORT=y
++CONFIG_SPL_I2C=y
++CONFIG_SPL_POWER=y
 +CONFIG_SPL_ATF=y
 +CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 +CONFIG_CMD_BOOTZ=y
@@ -83,11 +81,11 @@ index 00000000..3cb3b5c3
 +CONFIG_CMD_TIME=y
 +CONFIG_SPL_OF_CONTROL=y
 +CONFIG_TPL_OF_CONTROL=y
-+CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus-lts"
 +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 +CONFIG_TPL_OF_PLATDATA=y
 +CONFIG_ENV_IS_IN_MMC=y
 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
++CONFIG_SYS_MMC_ENV_DEV=1
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_TPL_DM=y
 +CONFIG_REGMAP=y
@@ -112,6 +110,7 @@ index 00000000..3cb3b5c3
 +CONFIG_SPL_PINCTRL=y
 +CONFIG_DM_PMIC=y
 +CONFIG_PMIC_RK8XX=y
++CONFIG_SPL_PMIC_RK8XX=y
 +CONFIG_SPL_DM_REGULATOR=y
 +CONFIG_REGULATOR_PWM=y
 +CONFIG_DM_REGULATOR_FIXED=y
@@ -124,6 +123,7 @@ index 00000000..3cb3b5c3
 +CONFIG_DM_RESET=y
 +CONFIG_BAUDRATE=1500000
 +CONFIG_DEBUG_UART_SHIFT=2
++CONFIG_SYSINFO=y
 +CONFIG_SYSRESET=y
 +# CONFIG_TPL_SYSRESET is not set
 +CONFIG_USB=y

diff --git a/...8-Add-support-for-radxa_rock-pi-e25.patch → ...ip-rk3568-Add-support-for-radxa_e25.patch b/...8-Add-support-for-radxa_rock-pi-e25.patch → ...ip-rk3568-Add-support-for-radxa_e25.patch
@@ -1,17 +1,17 @@
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -174,7 +174,8 @@ rk3568-evb.dtb \
+@@ -177,7 +177,8 @@ rk3568-evb.dtb \
  	rk3568-mrkaio-m68s.dtb \
  	rk3568-nanopi-r5s.dtb \
  	rk3566-quartz64-a.dtb \
 -	rk3568-rock-3a.dtb
 +	rk3568-rock-3a.dtb \
-+	rk3568-rock-pi-e25.dtb
++	rk3568-radxa-e25.dtb
 
  dtb-$(CONFIG_ROCKCHIP_RV1108) += \
  	rv1108-elgin-r1.dtb \
 --- /dev/null
-+++ b/arch/arm/dts/rk3568-rock-pi-e25-u-boot.dtsi
++++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
 @@ -0,0 +1,21 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +
@@ -35,18 +35,23 @@
 +	status = "okay";
 +};
 --- /dev/null
-+++ b/arch/arm/dts/rk3568-rock-pi-e25.dts
-@@ -0,0 +1,8 @@
++++ b/arch/arm/dts/rk3568-radxa-e25.dts
+@@ -0,0 +1,13 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +
 +#include "rk3568-evb.dts"
 +
 +/ {
-+	model = "Radxa ROCK Pi E25";
-+	compatible = "radxa,rockpi-e25", "rockchip,rk3568";
++	model = "Radxa E25";
++	compatible = "radxa,e25", "rockchip,rk3568";
++
++	aliases {
++		mmc0 = &sdmmc0;
++		mmc1 = &sdhci;
++	};
 +};
 --- /dev/null
-+++ b/configs/rock-pi-e25-rk3568_defconfig
++++ b/configs/radxa-e25-rk3568_defconfig
 @@ -0,0 +1,98 @@
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
@@ -55,7 +60,7 @@
 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
 +CONFIG_NR_DRAM_BANKS=2
-+CONFIG_DEFAULT_DEVICE_TREE="rk3568-rock-pi-e25"
++CONFIG_DEFAULT_DEVICE_TREE="rk3568-radxa-e25"
 +CONFIG_ROCKCHIP_RK3568=y
 +CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
 +CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
@@ -72,7 +77,7 @@
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_OF_SYSTEM_SETUP=y
-+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-pi-e25.dtb"
++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-radxa-e25.dtb"
 +# CONFIG_SYS_DEVICE_NULLDEV is not set
 +CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 +# CONFIG_DISPLAY_CPUINFO is not set

diff --git a/package/kernel/ksmbd/patches/010-fixes-build-on-6.1.patch b/package/kernel/ksmbd/patches/010-fixes-build-on-6.1.patch
@@ -0,0 +1,14 @@
+--- a/smb1pdu.c
++++ b/smb1pdu.c
+@@ -5851,7 +5851,11 @@ static int smb_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
+  *
+  * Return:	0 on success, otherwise -EINVAL
+  */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static bool ksmbd_fill_dirent(struct dir_context *ctx, const char *name, int namlen,
++#else
+ static int ksmbd_fill_dirent(struct dir_context *ctx, const char *name, int namlen,
++#endif
+ 		loff_t offset, u64 ino, unsigned int d_type)
+ {
+ 	struct ksmbd_readdir_data *buf =
diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
@@ -134,6 +134,7 @@ define KernelPackage/lib-zstd
 	$(LINUX_DIR)/crypto/zstd.ko \
 	$(LINUX_DIR)/lib/xxhash.ko \
 	$(LINUX_DIR)/lib/zstd/zstd_compress.ko \
+	$(LINUX_DIR)/lib/zstd/zstd_common.ko@ge6.1 \
 	$(LINUX_DIR)/lib/zstd/zstd_decompress.ko
   AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress)
 endef

diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
@@ -245,7 +245,7 @@ define KernelPackage/drm
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Direct Rendering Manager (DRM) support
   HIDDEN:=1
-  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight \
+  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +kmod-backlight \
 	+(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-fb
   KCONFIG:=	\
 	CONFIG_DRM	\