From: Robert Marko Date: Fri, 21 Oct 2022 11:08:35 +0000 (+0200) Subject: kernel: modules: wwan: adapt for kernel 6.1 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a02c5954f10291cf046f9bbf727fa01ce04a235;p=openwrt%2Fstaging%2Fnbd.git kernel: modules: wwan: adapt for kernel 6.1 Update the WWAN kmods for compilation under kernel 6.1: * Depend on kernel not being 5.10 rather than only 5.15 * Enable CONFIG_WWAN_DEBUGFS as its now optional from 5.17 * Add missing symbols for new WWAN drivers to generic config Signed-off-by: Robert Marko --- diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index dd458ece4c..934ba3c4f2 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1448,13 +1448,15 @@ $(eval $(call KernelPackage,sfc-falcon)) define KernelPackage/wwan SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=WWAN Driver Core - KCONFIG:=CONFIG_WWAN + KCONFIG:= \ + CONFIG_WWAN \ + CONFIG_WWAN_DEBUGFS=y@ge5.17 FILES:=$(LINUX_DIR)/drivers/net/wwan/wwan.ko AUTOLOAD:=$(call AutoProbe,wwan) endef define KernelPackage/wwan/description - his driver provides a common framework for WWAN drivers. + This driver provides a common framework for WWAN drivers. endef $(eval $(call KernelPackage,wwan)) diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1 index f8c0e9f939..48485051cb 100644 --- a/target/linux/generic/config-6.1 +++ b/target/linux/generic/config-6.1 @@ -3968,6 +3968,7 @@ CONFIG_MTD_SPLIT_SUPPORT=y # CONFIG_MTK_DEVAPC is not set # CONFIG_MTK_MMC is not set # CONFIG_MTK_MMSYS is not set +# CONFIG_MTK_T7XX is not set # CONFIG_MTK_THERMAL is not set # CONFIG_MULTIPLEXER is not set CONFIG_MULTIUSER=y @@ -4989,6 +4990,7 @@ CONFIG_PWRSEQ_SIMPLE=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set # CONFIG_QCOM_A7PLL is not set +# CONFIG_QCOM_BAM_DMUX is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set # CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set