package/kernel/mac80211/patches/build/100-backports-drop-QRTR-and-MHI.patch

   1 From 54e0f9aaf340377fb76acdffee9ec7372c4b70ae Mon Sep 17 00:00:00 2001
   2 From: Robert Marko <robimarko@gmail.com>
   3 Date: Mon, 17 Oct 2022 11:35:36 +0200
   4 Subject: [PATCH] backports: drop QRTR and MHI
   5
   6 Backports currently include QRTR and MHI due to ath11k-pci requiring them,
   7 however this at the same time prevents us from adding ath11k-ahb as it
   8 also requires QRTR however its AHB variant from the kernel will conflict
   9 with the core provided by backports.
  10
  11 Since MHI also conflicts with existing OpenWrt kmods providing MHI drop
  12 both from backports and use the ones provided by OpenWrt kernel.
  13
  14 Signed-off-by: Robert Marko <robimarko@gmail.com>
  15 ---
  16  Kconfig.sources                         | 2 --
  17  Makefile.kernel                         | 2 --
  18  drivers/net/wireless/ath/ath11k/Kconfig | 6 +++---
  19  local-symbols                           | 8 --------
  20  4 files changed, 3 insertions(+), 15 deletions(-)
  21
  22 --- a/Kconfig.sources
  23 +++ b/Kconfig.sources
  24 @@ -4,8 +4,6 @@ source "$BACKPORT_DIR/compat/Kconfig"
  25  # these are copied from the kernel
  26  source "$BACKPORT_DIR/net/wireless/Kconfig"
  27  source "$BACKPORT_DIR/net/mac80211/Kconfig"
  28 -source "$BACKPORT_DIR/net/qrtr/Kconfig"
  29 -source "$BACKPORT_DIR/drivers/bus/mhi/Kconfig"
  30  source "$BACKPORT_DIR/drivers/soc/qcom/Kconfig"
  31  source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
  32  source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
  33 --- a/Makefile.kernel
  34 +++ b/Makefile.kernel
  35 @@ -39,9 +39,7 @@ obj-y += compat/
  36
  37  obj-$(CPTCFG_CFG80211) += net/wireless/
  38  obj-$(CPTCFG_MAC80211) += net/mac80211/
  39 -obj-$(CPTCFG_QRTR) += net/qrtr/
  40  obj-$(CPTCFG_QCOM_QMI_HELPERS) += drivers/soc/qcom/
  41 -obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/
  42  obj-$(CPTCFG_WLAN) += drivers/net/wireless/
  43  obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
  44
  45 --- a/drivers/net/wireless/ath/ath11k/Kconfig
  46 +++ b/drivers/net/wireless/ath/ath11k/Kconfig
  47 @@ -25,9 +25,9 @@ config ATH11K_PCI
  48         tristate "Atheros ath11k PCI support"
  49         depends on m
  50         depends on ATH11K && PCI
  51 -       select MHI_BUS
  52 -       select QRTR
  53 -       select QRTR_MHI
  54 +       depends on MHI_BUS
  55 +       depends on QRTR
  56 +       depends on QRTR_MHI
  57         help
  58           This module adds support for PCIE bus
  59
  60 --- a/local-symbols
  61 +++ b/local-symbols
  62 @@ -65,14 +65,6 @@ MAC80211_MESH_PS_DEBUG=
  63  MAC80211_TDLS_DEBUG=
  64  MAC80211_DEBUG_COUNTERS=
  65  MAC80211_STA_HASH_MAX_SIZE=
  66 -QRTR=
  67 -QRTR_SMD=
  68 -QRTR_TUN=
  69 -QRTR_MHI=
  70 -MHI_BUS=
  71 -MHI_BUS_DEBUG=
  72 -MHI_BUS_PCI_GENERIC=
  73 -MHI_BUS_EP=
  74  QCOM_AOSS_QMP=
  75  QCOM_COMMAND_DB=
  76  QCOM_CPR=