[PATCH 379/379][SRU][OEM-5.6] UBUNTU: [Config] enable ath11k WiFi driver

[You-Sheng Yang]

BugLink: https://bugs.launchpad.net/bugs/1879633

Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 debian.oem/config/annotations          | 17 ++++++++++++++---
 debian.oem/config/config.common.ubuntu | 13 +++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations
index 07f658e276aa..110148ede593 100644
--- a/debian.oem/config/annotations
+++ b/debian.oem/config/annotations
@@ -632,6 +632,7 @@ CONFIG_TI_SYSC                                  policy<{'armhf': 'y'}>
 CONFIG_UNIPHIER_SYSTEM_BUS                      policy<{'armhf': 'y'}>
 CONFIG_VEXPRESS_CONFIG                          policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_FSL_MC_BUS                               policy<{'arm64': 'y'}>
+CONFIG_MHI_BUS                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 
 # Menu: Device Drivers >> Character devices
 CONFIG_DEVMEM                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -6062,6 +6063,15 @@ CONFIG_CARL9170_LEDS                            policy<{'amd64': 'y', 'arm64': '
 CONFIG_CARL9170_DEBUGFS                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_CARL9170_HWRNG                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 
+# Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices >> Qualcomm Technologies 802.11ax chipset support
+CONFIG_ATH11K                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_ATH11K_PCI                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_ATH11K_AHB                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
+CONFIG_ATH11K_DEBUG                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
+CONFIG_ATH11K_DEBUGFS                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
+CONFIG_ATH11K_SPECTRAL                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
+CONFIG_ATH11K_TRACING                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
+
 # Menu: Device Drivers >> Network device support >> Wireless LAN >> Atheros/Qualcomm devices >> Wilocity 60g WiFi card wil6210 support
 CONFIG_WIL6210                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_WIL6210_ISR_COR                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
@@ -11296,9 +11306,10 @@ CONFIG_DNS_RESOLVER                             policy<{'amd64': 'y', 'arm64': '
 CONFIG_NETLINK_DIAG                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_NSH                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_HSR                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
-CONFIG_QRTR                                     policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_QRTR_SMD                                 policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_QRTR_TUN                                 policy<{'arm64': 'm', 'armhf': 'm'}>
+CONFIG_QRTR                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_QRTR_MHI                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_QRTR_SMD                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_QRTR_TUN                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_CGROUP_NET_PRIO                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_CGROUP_NET_CLASSID                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BPF_JIT                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
index 70abd87c9223..59a29959aacd 100644
--- a/debian.oem/config/config.common.ubuntu
+++ b/debian.oem/config/config.common.ubuntu
@@ -405,6 +405,13 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_SPECTRAL=y
 CONFIG_ATH10K_TRACING=y
 CONFIG_ATH10K_USB=m
+CONFIG_ATH11K=m
+# CONFIG_ATH11K_AHB is not set
+# CONFIG_ATH11K_DEBUG is not set
+CONFIG_ATH11K_DEBUGFS=y
+CONFIG_ATH11K_PCI=m
+CONFIG_ATH11K_SPECTRAL=y
+CONFIG_ATH11K_TRACING=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
 CONFIG_ATH5K_PCI=y
@@ -4285,6 +4292,7 @@ CONFIG_MFD_WM8400=y
 CONFIG_MFD_WM8994=m
 CONFIG_MFD_WM8997=y
 CONFIG_MFD_WM8998=y
+CONFIG_MHI_BUS=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@@ -5705,6 +5713,7 @@ CONFIG_QCOM_CPR=m
 CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_HIDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_QMI_HELPERS=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
@@ -5730,6 +5739,10 @@ CONFIG_QLGE=m
 CONFIG_QNX4FS_FS=m
 # CONFIG_QNX6FS_DEBUG is not set
 CONFIG_QNX6FS_FS=m
+CONFIG_QRTR=m
+CONFIG_QRTR_MHI=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
 CONFIG_QSEMI_PHY=m
 CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
-- 
2.29.2