From 3a8445efd66ed06fc06bc56ac0fcd953b9432fb3 Mon Sep 17 00:00:00 2001
From: graysky <therealgraysky AT proton DOT me>
Date: Sun, 8 Sep 2024 17:26:03 -0400
Subject: [PATCH] core/linux-armv7 to 6.10.9-2

Add some addition WiFi modules and sync kernel config w/ upstream
Closes #2060
---
 core/linux-armv7/PKGBUILD |  4 ++--
 core/linux-armv7/config   | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 51671f9ae..64e7a2d19 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -8,7 +8,7 @@ _srcname=linux-6.10
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
 pkgver=6.10.9
-pkgrel=1
+pkgrel=2
 rcnver=6.10.0
 rcnrel=multiv7-r1
 arch=('armv7h')
@@ -41,7 +41,7 @@ md5sums=('c0ce046a9a0d041e13cf222f81eae574'
          '8cd31506d15134f0165927f03bfc23f0'
          '8cc8dce375aff1e9d9a9907fc40a4196'
          '5a761027013d2c0933ec81f6d09c77f8'
-         '0e8f23625b143d6f044abd8ab71a70b7'
+         '9468d058ce2b5dc249123bf79277301e'
          '9e4fc0be1094c64af6f127e5be9ceb50'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
diff --git a/core/linux-armv7/config b/core/linux-armv7/config
index a24a62ade..430774978 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.10.3-1 Kernel Configuration
+# Linux/arm 6.10.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507"
 CONFIG_CC_IS_GCC=y
@@ -252,7 +252,6 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -1791,6 +1790,7 @@ CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_QRTR=m
 # CONFIG_QRTR_SMD is not set
 # CONFIG_QRTR_TUN is not set
+CONFIG_QRTR_MHI=m
 CONFIG_NET_NCSI=y
 # CONFIG_NCSI_OEM_CMD_GET_MAC is not set
 # CONFIG_NCSI_OEM_CMD_KEEP_PHY is not set
@@ -2187,7 +2187,9 @@ CONFIG_TI_PWMSS=y
 CONFIG_TI_SYSC=y
 CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_FSL_MC_BUS is not set
-# CONFIG_MHI_BUS is not set
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+# CONFIG_MHI_BUS_PCI_GENERIC is not set
 # CONFIG_MHI_BUS_EP is not set
 # end of Bus devices
 
@@ -2900,6 +2902,7 @@ CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 # CONFIG_NETKIT is not set
 CONFIG_NET_VRF=m
+# CONFIG_MHI_NET is not set
 # CONFIG_ARCNET is not set
 CONFIG_ATM_DRIVERS=y
 CONFIG_ATM_DUMMY=m
@@ -3559,9 +3562,10 @@ CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_ATH11K=m
 CONFIG_ATH11K_AHB=m
-# CONFIG_ATH11K_PCI is not set
+CONFIG_ATH11K_PCI=m
 # CONFIG_ATH11K_DEBUG is not set
-# CONFIG_ATH12K is not set
+CONFIG_ATH12K=m
+# CONFIG_ATH12K_DEBUG is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
@@ -3688,9 +3692,10 @@ CONFIG_MT7921_COMMON=m
 CONFIG_MT7921E=m
 CONFIG_MT7921S=m
 CONFIG_MT7921U=m
-# CONFIG_MT7996E is not set
-# CONFIG_MT7925E is not set
-# CONFIG_MT7925U is not set
+CONFIG_MT7996E=m
+CONFIG_MT7925_COMMON=m
+CONFIG_MT7925E=m
+CONFIG_MT7925U=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m