From ae12d2f77bed6571c45dc11c7f9fa53cac95016b Mon Sep 17 00:00:00 2001
From: aiamadeus <2789289348@qq.com>
Date: Fri, 24 Mar 2023 22:26:02 +0800
Subject: [PATCH] rockchip: refresh kernel 5.15 config

Also fixes: #11019
---
 package/kernel/linux/modules/other.mk   | 6 ++++--
 target/linux/generic/config-5.15        | 1 +
 target/linux/rockchip/armv8/config-5.15 | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 28783b92b..8f3ac0639 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -41,9 +41,9 @@ define KernelPackage/bluetooth
 	CONFIG_BT_RFCOMM \
 	CONFIG_BT_BNEP \
 	CONFIG_BT_HCIBTUSB \
-	CONFIG_BT_HCIBTUSB_BCM=n \
+	CONFIG_BT_HCIBTUSB_BCM=y \
 	CONFIG_BT_HCIBTUSB_MTK=y \
-	CONFIG_BT_HCIBTUSB_RTL=n \
+	CONFIG_BT_HCIBTUSB_RTL=y \
 	CONFIG_BT_HCIUART \
 	CONFIG_BT_HCIUART_BCM=y \
 	CONFIG_BT_HCIUART_INTEL=n \
@@ -60,7 +60,9 @@ 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/btqca.ko \
+	$(LINUX_DIR)/drivers/bluetooth/btrtl.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btintel.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btmtk.ko@ge5.17
   AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 7b895a43d..0645d85f7 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -4835,6 +4835,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LMH is not set
 # CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set
+# CONFIG_QCOM_QMI_HELPERS is not set
 # CONFIG_QCOM_SPMI_ADC5 is not set
 # CONFIG_QCOM_SPMI_ADC_TM5 is not set
 # CONFIG_QCOM_SPMI_IADC is not set
diff --git a/target/linux/rockchip/armv8/config-5.15 b/target/linux/rockchip/armv8/config-5.15
index 076b4fe90..9f16c93cd 100644
--- a/target/linux/rockchip/armv8/config-5.15
+++ b/target/linux/rockchip/armv8/config-5.15
@@ -67,6 +67,8 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_RK3328_DMC_DEVFREQ=y
 # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
 # CONFIG_ARM_SCMI_CPUFREQ is not set
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_POWER_DOMAIN=y
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
@@ -176,6 +178,7 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
@@ -335,6 +338,7 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_LIBCRC32C=y
 CONFIG_LIBFDT=y
+CONFIG_LIB_MEMNEQ=y
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
@@ -466,7 +470,7 @@ CONFIG_PLATFORM_MHU=y
 CONFIG_PM=y
 CONFIG_PM_CLK=y
 CONFIG_PM_DEVFREQ=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_PM_OPP=y