From faf4476659c2bf8532723e74bd6a61b8c3c07dc2 Mon Sep 17 00:00:00 2001 From: lean Date: Tue, 12 Jul 2022 18:54:05 +0800 Subject: [PATCH] kernel: Make QMI Helpers user selectable in 5.18 --- package/kernel/mac80211/ath.mk | 4 +-- ...com-Make-QMI-Helpers-user-selectable.patch | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 target/linux/generic/hack-5.18/901-soc-qcom-Make-QMI-Helpers-user-selectable.patch diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index 7f91cf1cf..e678180a5 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -344,7 +344,7 @@ define KernelPackage/ath11k-ahb $(call KernelPackage/mac80211/Default) TITLE:=Qualcomm 802.11ax AHB wireless chipset support URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k - DEPENDS+= @TARGET_ipq807x +kmod-ath11k +LINUX_5_15:kmod-qrtr-smd + DEPENDS+= @TARGET_ipq807x +kmod-ath11k +(LINUX_5_15||LINUX_5_18):kmod-qrtr-smd FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k_ahb.ko AUTOLOAD:=$(call AutoProbe,ath11k_ahb) endef @@ -358,7 +358,7 @@ define KernelPackage/ath11k-pci $(call KernelPackage/mac80211/Default) TITLE:=Qualcomm 802.11ax PCI wireless chipset support URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k - DEPENDS+= @PCI_SUPPORT +LINUX_5_15:kmod-qrtr-mhi +kmod-ath11k + DEPENDS+= @PCI_SUPPORT +(LINUX_5_15||LINUX_5_18):kmod-qrtr-mhi +kmod-ath11k FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k_pci.ko AUTOLOAD:=$(call AutoProbe,ath11k_pci) endef diff --git a/target/linux/generic/hack-5.18/901-soc-qcom-Make-QMI-Helpers-user-selectable.patch b/target/linux/generic/hack-5.18/901-soc-qcom-Make-QMI-Helpers-user-selectable.patch new file mode 100644 index 000000000..a5ed332ff --- /dev/null +++ b/target/linux/generic/hack-5.18/901-soc-qcom-Make-QMI-Helpers-user-selectable.patch @@ -0,0 +1,28 @@ +From b9b94712847f8fa6ca8dc03422ba9e0332b6997d Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Thu, 13 May 2021 14:54:43 +0200 +Subject: [PATCH] soc: qcom: Make QMI Helpers user selectable + +Wireless backports for ath11k have a different logic +then upstream as they depend on QMI helpers instead +of selecting them. + +So, to make it possible to select QMI helpers +through KConfig add text to tristate. + +Signed-off-by: Robert Marko +--- + drivers/soc/qcom/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/soc/qcom/Kconfig ++++ b/drivers/soc/qcom/Kconfig +@@ -92,7 +92,7 @@ config QCOM_PDR_HELPERS + select QCOM_QMI_HELPERS + + config QCOM_QMI_HELPERS +- tristate ++ tristate "Qualcomm QMI helpers" + depends on NET + + config QCOM_RMTFS_MEM