[openwrt/openwrt] kernel: fix missing mhi control devices

[LEDE Commits]

xback pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a5da8e6ecdfe43efe6cb6e28f28f1aab543ca2d6

commit a5da8e6ecdfe43efe6cb6e28f28f1aab543ca2d6
Author: Koen Vandeputte <koen.vandeputte at ncentric.com>
AuthorDate: Fri Aug 5 16:34:44 2022 +0200

    kernel: fix missing mhi control devices
    
    Both of these packages depend on CONFIG_WWAN
    in the kernel.
    
    Also fix the missing "wwan" subfolder in the path.
    
    This fixes the missing devices in /dev after booting an MHI capable modem.
    
    Fixes: 2519190fec ("kernel: package mhi wwan ctrl driver")
    Fixes: 6af46796fa ("kernel: package mhi mbim driver")
    
    Signed-off-by: Koen Vandeputte <koen.vandeputte at ncentric.com>
---
 package/kernel/linux/modules/netdevices.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 2e81835fe1..bb4e1ab5cd 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -1380,8 +1380,9 @@ define KernelPackage/mhi-wwan-ctrl
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=MHI WWAN Control
   DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus
-  KCONFIG:=CONFIG_MHI_WWAN_CTRL
-  FILES:=$(LINUX_DIR)/drivers/net/mhi_wwan_ctrl.ko
+  KCONFIG:=CONFIG_MHI_WWAN_CTRL \
+	CONFIG_WWAN=y
+  FILES:=$(LINUX_DIR)/drivers/net/wwan/mhi_wwan_ctrl.ko
   AUTOLOAD:=$(call AutoProbe,mhi_wwan_ctrl)
 endef
 
@@ -1396,8 +1397,9 @@ define KernelPackage/mhi-wwan-mbim
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=MHI MBIM
   DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus
-  KCONFIG:=CONFIG_MHI_WWAN_MBIM
-  FILES:=$(LINUX_DIR)/drivers/net/mhi_wwan_mbim.ko
+  KCONFIG:=CONFIG_MHI_WWAN_MBIM \
+	CONFIG_WWAN=y
+  FILES:=$(LINUX_DIR)/drivers/net/wwan/mhi_wwan_mbim.ko
   AUTOLOAD:=$(call AutoProbe,mhi_wwan_mbim)
 endef