From 20ecdbcc507bc6d6d02d378195ae27ce1e486260 Mon Sep 17 00:00:00 2001
From: graysky <therealgraysky AT proton DOT me>
Date: Sun, 3 Nov 2024 07:33:45 -0500
Subject: [PATCH] core/linux-aarch64-rc: merge MHI WWAN options

Merge options from PR#2069 which enable generic MHI PCI bus and WWAN driver
options needed to support various PCIe/MHI attached Qualcomm 5G/LTE modems.
---
 core/linux-aarch64-rc/PKGBUILD |  2 +-
 core/linux-aarch64-rc/config   | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/linux-aarch64-rc/PKGBUILD b/core/linux-aarch64-rc/PKGBUILD
index 66b0e32a6..dcf652dc5 100644
--- a/core/linux-aarch64-rc/PKGBUILD
+++ b/core/linux-aarch64-rc/PKGBUILD
@@ -30,7 +30,7 @@ md5sums=('b48f6a28a934973d0036ba4be578b235'
          '7b08a199a97e3e2288e5c03d8e8ded2d'
          'c9d4e392555b77034e24e9f87c5ff0b3'
          'a6abfb191ecb3d7d5f6ccdaca335a11d'
-         '4d2054bef36380563231c532d4723684'
+         '41b74fc51713929c15716904fc888371'
          '7c97cf141750ad810235b1ad06eb9f75'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
diff --git a/core/linux-aarch64-rc/config b/core/linux-aarch64-rc/config
index 64fd97025..3cf4a2265 100644
--- a/core/linux-aarch64-rc/config
+++ b/core/linux-aarch64-rc/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.0-rc2 Kernel Configuration
+# Linux/arm64 6.12.0-rc5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507"
 CONFIG_CC_IS_GCC=y
@@ -2223,7 +2223,7 @@ CONFIG_FSL_MC_BUS=y
 # CONFIG_FSL_MC_UAPI_SUPPORT 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_PCI_GENERIC=m
 # CONFIG_MHI_BUS_EP is not set
 # end of Bus devices
 
@@ -3892,7 +3892,15 @@ CONFIG_IEEE802154_ATUSB=m
 #
 # Wireless WAN
 #
-# CONFIG_WWAN is not set
+CONFIG_WWAN=m
+# CONFIG_WWAN_DEBUGFS is not set
+# CONFIG_WWAN_HWSIM is not set
+CONFIG_MHI_WWAN_CTRL=m
+CONFIG_MHI_WWAN_MBIM=m
+# CONFIG_QCOM_BAM_DMUX is not set
+# CONFIG_RPMSG_WWAN_CTRL is not set
+# CONFIG_IOSM is not set
+# CONFIG_MTK_T7XX is not set
 # end of Wireless WAN
 
 # CONFIG_VMXNET3 is not set