mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
1bfcc1ea8a
Brings lots of driver updates and API changes needed for mt76 updates. Disable iwlwifi and ath11k on 5.15, since backport is too difficult, and the only remaining targets won't need those drivers. Signed-off-by: Felix Fietkau <nbd@nbd.name>
77 lines
2.4 KiB
Diff
77 lines
2.4 KiB
Diff
From 54e0f9aaf340377fb76acdffee9ec7372c4b70ae Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Mon, 17 Oct 2022 11:35:36 +0200
|
|
Subject: [PATCH] backports: drop QRTR and MHI
|
|
|
|
Backports currently include QRTR and MHI due to ath11k-pci requiring them,
|
|
however this at the same time prevents us from adding ath11k-ahb as it
|
|
also requires QRTR however its AHB variant from the kernel will conflict
|
|
with the core provided by backports.
|
|
|
|
Since MHI also conflicts with existing OpenWrt kmods providing MHI drop
|
|
both from backports and use the ones provided by OpenWrt kernel.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
Kconfig.sources | 2 --
|
|
Makefile.kernel | 2 --
|
|
drivers/net/wireless/ath/ath11k/Kconfig | 6 +++---
|
|
local-symbols | 8 --------
|
|
4 files changed, 3 insertions(+), 15 deletions(-)
|
|
|
|
--- a/Kconfig.sources
|
|
+++ b/Kconfig.sources
|
|
@@ -4,8 +4,6 @@ source "$BACKPORT_DIR/compat/Kconfig"
|
|
# these are copied from the kernel
|
|
source "$BACKPORT_DIR/net/wireless/Kconfig"
|
|
source "$BACKPORT_DIR/net/mac80211/Kconfig"
|
|
-source "$BACKPORT_DIR/net/qrtr/Kconfig"
|
|
-source "$BACKPORT_DIR/drivers/bus/mhi/Kconfig"
|
|
source "$BACKPORT_DIR/drivers/soc/qcom/Kconfig"
|
|
source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
|
|
source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
|
|
--- a/Makefile.kernel
|
|
+++ b/Makefile.kernel
|
|
@@ -38,9 +38,7 @@ obj-y += compat/
|
|
|
|
obj-$(CPTCFG_CFG80211) += net/wireless/
|
|
obj-$(CPTCFG_MAC80211) += net/mac80211/
|
|
-obj-$(CPTCFG_QRTR) += net/qrtr/
|
|
obj-$(CPTCFG_QCOM_QMI_HELPERS) += drivers/soc/qcom/
|
|
-obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/
|
|
obj-$(CPTCFG_WLAN) += drivers/net/wireless/
|
|
obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/Kconfig
|
|
+++ b/drivers/net/wireless/ath/ath11k/Kconfig
|
|
@@ -25,9 +25,9 @@ config ATH11K_PCI
|
|
tristate "Atheros ath11k PCI support"
|
|
depends on m
|
|
depends on ATH11K && PCI
|
|
- select MHI_BUS
|
|
- select QRTR
|
|
- select QRTR_MHI
|
|
+ depends on MHI_BUS
|
|
+ depends on QRTR
|
|
+ depends on QRTR_MHI
|
|
help
|
|
This module adds support for PCIE bus
|
|
|
|
--- a/local-symbols
|
|
+++ b/local-symbols
|
|
@@ -59,14 +59,6 @@ MAC80211_MESH_PS_DEBUG=
|
|
MAC80211_TDLS_DEBUG=
|
|
MAC80211_DEBUG_COUNTERS=
|
|
MAC80211_STA_HASH_MAX_SIZE=
|
|
-QRTR=
|
|
-QRTR_SMD=
|
|
-QRTR_TUN=
|
|
-QRTR_MHI=
|
|
-MHI_BUS=
|
|
-MHI_BUS_DEBUG=
|
|
-MHI_BUS_PCI_GENERIC=
|
|
-MHI_BUS_EP=
|
|
QCOM_AOSS_QMP=
|
|
QCOM_COMMAND_DB=
|
|
QCOM_GENI_SE=
|