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

* https://github.com/coolsnowwolf/lede: rockchip: add support for EZPRO Mrkaio M68S PLUS (coolsnowwolf#11020) bluetooth: fix Broadcom module
tonvoo · Mar 21, 2023 · 051fa2f · 051fa2f
2 parents 88d6206 + 229ba8e
commit 051fa2f
Show file tree

Hide file tree

Showing 7 changed files with 655 additions and 4 deletions.
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
@@ -152,7 +152,8 @@ define U-Boot/mrkaio-m68s-rk3568
   BUILD_SUBTARGET:=armv8
   NAME:=Mrkaio M68S
   BUILD_DEVICES:= \
-    ezpro_mrkaio-m68s
+    ezpro_mrkaio-m68s \
+    ezpro_mrkaio-m68s-plus
   DEPENDS:=+PACKAGE_u-boot-mrkaio-m68s-rk3568:arm-trusted-firmware-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
@@ -60,7 +60,7 @@ define KernelPackage/bluetooth
 	$(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \
 	$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btusb.ko \
-	$(LINUX_DIR)/drivers/bluetooth/btbcm.ko \
+	$(LINUX_DIR)/drivers/bluetooth/btbcm.ko@ge5.17 \
 	$(LINUX_DIR)/drivers/bluetooth/btqca.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btintel.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btmtk.ko@ge5.17

diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
@@ -10,6 +10,7 @@ rockchip_setup_interfaces()
 	case "$board" in
 	ariaboard,photonicat|\
 	ezpro,mrkaio-m68s|\
+	ezpro,mrkaio-m68s-plus|\
 	hinlink,opc-h66k|\
 	friendlyarm,nanopi-r2c|\
 	friendlyarm,nanopi-r2s|\
@@ -79,6 +80,7 @@ rockchip_setup_macs()
 	case "$board" in
 	ariaboard,photonicat|\
 	ezpro,mrkaio-m68s|\
+	ezpro,mrkaio-m68s-plus|\
 	hinlink,opc-h66k|\
 	hinlink,opc-h68k|\
 	fastrhino,r66s|\