Add support for RTL8856bs WiFi/BT

Author: Stane1983

projects/Amlogic-ce/devices/Amlogic-ng/options

@@ -114,7 +114,7 @@
     ADDITIONAL_DRIVERS+=" gpu-aml openvfd-driver wifi_dummy-aml media_modules-aml
                         ap6xxx-aml ssv6xxx-aml mt7668-aml RTL8188FTV-aml RTL8189ES-aml RTL8189FS-aml
                         RTL8723BS-aml RTL8814AU RTL8822BU-aml RTL8822BS-aml RTL8822CS-aml RTL8152-aml
-                        RTL8821CS-aml qca9377-aml qca6174-aml smartchip uwe5631-aml"
+                        RTL8821CS-aml RTL8852BS-aml qca9377-aml qca6174-aml smartchip uwe5631-aml"
 
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,

projects/Amlogic-ce/packages/linux-drivers/amlogic/RTL8852BS-aml/package.mk

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present Team CoreELEC (https://coreelec.org)
+
+PKG_NAME="RTL8852BS-aml"
+PKG_VERSION="dd202f37cbffb0e93ba15746d373a87228334e5f"
+PKG_SHA256="0acc9c0eb4203e690b4254cd563526b7aabfc7d43ec85dc7f2f5ef54212e0b41"
+PKG_ARCH="arm aarch64"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/Stane1983/rtl8852bs-aml"
+PKG_URL="https://github.com/Stane1983/rtl8852bs-aml/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain linux"
+PKG_NEED_UNPACK="${LINUX_DEPENDS}"
+PKG_LONGDESC="Realtek RTL8852BS Linux driver"
+PKG_IS_KERNEL_PKG="yes"
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  sed -i 's/#define DEFAULT_RANDOM_MACADDR.*/#define DEFAULT_RANDOM_MACADDR 0/g' ${PKG_BUILD}/core/rtw_ieee80211.c
+}
+
+make_target() {
+  kernel_make -C ${PKG_BUILD} \
+    M=${PKG_BUILD} \
+    KSRC=$(kernel_path) \
+    CONFIG_POWER_SAVE=n \
+    CONFIG_RTW_DEBUG=n \
+    modules
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+  find ${PKG_BUILD}/ -name \*.ko -not -path '*/\.*' -exec cp {} ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} \;
+}

projects/Amlogic-ce/packages/linux-drivers/amlogic/uwe5631-aml/system.d/sprd_sdio-firmware-aml.service

@@ -1,5 +1,7 @@
 [Unit]
 Description=Attach /dev/ttyBT0 to BlueZ stack using sprd type
+ConditionPathExists=|!/sys/class/mmc_host/sdio/sdio:8800
+ConditionPathExists=|!/sys/class/mmc_host/mmc2/mmc2:8800
 Wants=bluetooth.service
 Before=bluetooth.service
 After=dev-ttyBT0.device

projects/Amlogic-ce/packages/linux-drivers/amlogic/uwe5631-aml/udev.d/80-unisoc_sdio.rules

@@ -1,5 +1,5 @@
 ### UniSOC UWE5631 and UWE5621 kernel modules
 ACTION=="add", ENV{SUBSYSTEM}=="sdio", ENV{OF_NAME}=="wifi", ENV{OF_COMPATIBLE_0}=="sprd,unisoc-wifi", \
-  ATTRS{vendor}=="0x0000", ATTRS{device}=="0x0000",
-  RUN{builtin}+="kmod load sprdwl_ng sprdbt_tty hci_uart" \
+  ATTRS{vendor}=="0x0000", ATTRS{device}=="0x0000", \
+  RUN{builtin}+="kmod load sprdwl_ng sprdbt_tty hci_uart", \
   TAG+="systemd", ENV{SYSTEMD_WANTS}+="sprd_sdio-firmware-aml.service"

projects/Amlogic-ce/packages/linux-firmware/amlogic/rtkbt-firmware-aml/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
 
 PKG_NAME="rtkbt-firmware-aml"
-PKG_VERSION="763c7195bb0328b45a5679e212ab05150361cc3a"
-PKG_SHA256="2996dd867990a14b8d431c789285363ff35f4f2304ce8c92db401122ec43db9a"
+PKG_VERSION="4d95579f256383af2df39d796f38a91ee6ec0b80"
+PKG_SHA256="7a2884532969f84596f469cde599b8ecc026e80263ae64c9faf0e22a0332f569"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/CoreELEC/rtkbt-firmware-aml"
 PKG_URL="https://github.com/CoreELEC/rtkbt-firmware-aml/archive/$PKG_VERSION.tar.gz"

projects/Amlogic-ce/packages/linux-firmware/amlogic/rtkbt-firmware-aml/udev.d/80-rtkbt-firmware-aml.rules

@@ -6,6 +6,7 @@ ACTION!="add", GOTO="end"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0xb723", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rtkbt-firmware-aml.service"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0xb822", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rtkbt-firmware-aml.service"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0xc822", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rtkbt-firmware-aml.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0xb852", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rtkbt-firmware-aml.service"
 GOTO="end"
 
 LABEL="end"

projects/Amlogic-ce/packages/tools/rtk_hciattach/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
 
 PKG_NAME="rtk_hciattach"
-PKG_VERSION="58820c428d2ecae6aaf5e4f00997652b9479853a"
-PKG_SHA256="20161cf3011f57dc9912db7270be1a83e543a61ea8757c23eaf983542fb021e0"
+PKG_VERSION="3d0ed39cfdd24343715057e93134cd63b7321827"
+PKG_SHA256="6c5908e4e07fe4a74c54f5b58f01bdbeffc2aa2f8b529c5f32ce897e087edf7a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/Caesar-github/rkwifibt"
 PKG_URL="https://github.com/Caesar-github/rkwifibt/archive/$PKG_VERSION.tar.gz"

projects/Amlogic-ce/packages/tools/rtk_hciattach/patches/rtk_hciattach-02-change-location-of-btaddr-file.patch

@@ -0,0 +1,25 @@
+From ca8ab97b2d72632858867110d76b1d06123485c9 Mon Sep 17 00:00:00 2001
+From: Stanislav Vlasic <svlasic@gmail.com>
+Date: Mon, 15 Aug 2022 00:06:37 +0200
+Subject: [PATCH] Change location of btaddr file
+
+---
+ realtek/rtk_hciattach/rtb_fwc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rtb_fwc.c b/rtb_fwc.c
+index 5e9e370..cac9309 100644
+--- a/rtb_fwc.c
++++ b/rtb_fwc.c
+@@ -39,7 +39,7 @@
+ #define FIRMWARE_DIRECTORY	"/lib/firmware/rtlbt/"
+ #define BT_CONFIG_DIRECTORY	"/lib/firmware/rtlbt/"
+ #define EXTRA_CONFIG_FILE	"/opt/rtk_btconfig.txt"
+-#define BT_ADDR_FILE		"/opt/bdaddr"
++#define BT_ADDR_FILE		"/storage/.config/btaddr"
+ #define BDADDR_STRING_LEN	17
+ 
+ struct list_head {
+-- 
+2.37.2
+