[openwrt/openwrt] kernel: modules: adapt for kernel 6.1
LEDE Commits
lede-commits at lists.infradead.org
Mon May 22 13:40:40 PDT 2023
ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a5118876441b6fe41ae7240f84a93c21c2a7ce36
commit a5118876441b6fe41ae7240f84a93c21c2a7ce36
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Oct 20 03:13:50 2022 +0200
kernel: modules: adapt for kernel 6.1
Adapt kernel modules to support kernel 6.1.
Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
package/kernel/linux/modules/hwmon.mk | 2 +-
package/kernel/linux/modules/i2c.mk | 16 +++++++++++++++-
package/kernel/linux/modules/lib.mk | 1 +
package/kernel/linux/modules/netfilter.mk | 10 +++++-----
package/kernel/linux/modules/netsupport.mk | 4 +++-
package/kernel/linux/modules/other.mk | 3 ++-
package/kernel/linux/modules/usb.mk | 4 +++-
7 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 29392548d4..23e32655b2 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -52,7 +52,7 @@ define KernelPackage/hwmon-adt7410
$(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
$(LINUX_DIR)/drivers/hwmon/adt7410.ko
AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410)
- $(call AddDepends/hwmon,+kmod-i2c-core)
+ $(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_1:kmod-regmap-core)
endef
define KernelPackage/hwmon-adt7410/description
diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk
index 6b3cf98345..1c65a26edc 100644
--- a/package/kernel/linux/modules/i2c.mk
+++ b/package/kernel/linux/modules/i2c.mk
@@ -84,6 +84,20 @@ endef
$(eval $(call KernelPackage,i2c-algo-pcf))
+I2C_CCGS_UCSI_MODULES:= \
+ CONFIG_I2C_CCGX_UCSI:drivers/i2c/busses/i2c-ccgx-ucsi
+
+define KernelPackage/i2c-ccgs-ucsi
+ $(call i2c_defaults,$(I2C_CCGS_UCSI_MODULES),58)
+ TITLE:=Cypress CCGx Type-C controller
+ DEPENDS:=+kmod-i2c-core +kmod-regmap-core
+ HIDDEN:=y
+endef
+
+
+$(eval $(call KernelPackage,i2c-ccgs-ucsi))
+
+
I2C_DWCORE_MODULES:= \
CONFIG_I2C_DESIGNWARE_CORE:drivers/i2c/busses/i2c-designware-core
@@ -103,7 +117,7 @@ I2C_DWPCI_MODULES:= \
define KernelPackage/i2c-designware-pci
$(call i2c_defaults,$(I2C_DWPCI_MODULES),59)
TITLE:=Synopsys DesignWare PCI
- DEPENDS:=@PCI_SUPPORT +kmod-i2c-designware-core
+ DEPENDS:=@PCI_SUPPORT +kmod-i2c-designware-core +kmod-i2c-ccgs-ucsi
endef
define KernelPackage/i2c-designware-pci/description
diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index 299c5a8c35..c7d32d7317 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -134,6 +134,7 @@ define KernelPackage/lib-zstd
FILES:= \
$(LINUX_DIR)/crypto/zstd.ko \
$(LINUX_DIR)/lib/xxhash.ko \
+ $(LINUX_DIR)/lib/zstd/zstd_common.ko at ge6.1 \
$(LINUX_DIR)/lib/zstd/zstd_compress.ko \
$(LINUX_DIR)/lib/zstd/zstd_decompress.ko
AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress)
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 99a48a37d4..7cfbecd949 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -1165,15 +1165,15 @@ define KernelPackage/nft-offload
DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat
KCONFIG:= \
CONFIG_NF_FLOW_TABLE_INET \
- CONFIG_NF_FLOW_TABLE_IPV4 \
- CONFIG_NF_FLOW_TABLE_IPV6 \
+ CONFIG_NF_FLOW_TABLE_IPV4 at lt5.17 \
+ CONFIG_NF_FLOW_TABLE_IPV6 at lt5.17 \
CONFIG_NFT_FLOW_OFFLOAD
FILES:= \
$(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \
- $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko \
- $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko \
+ $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko at lt5.17 \
+ $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko at lt5.17 \
$(LINUX_DIR)/net/netfilter/nft_flow_offload.ko
- AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nf_flow_table_ipv4 nf_flow_table_ipv6 nft_flow_offload)
+ AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nf_flow_table_ipv4 at lt5.17 nf_flow_table_ipv6 at lt5.17 nft_flow_offload)
endef
$(eval $(call KernelPackage,nft-offload))
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index b739289809..8ef99069d3 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -92,7 +92,9 @@ define KernelPackage/vxlan
+kmod-udptunnel4 \
+IPV6:kmod-udptunnel6
KCONFIG:=CONFIG_VXLAN
- FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
+ FILES:= \
+ $(LINUX_DIR)/drivers/net/vxlan.ko at lt5.18 \
+ $(LINUX_DIR)/drivers/net/vxlan/vxlan.ko at ge5.18
AUTOLOAD:=$(call AutoLoad,13,vxlan)
endef
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index cd827725bd..ac26c2a150 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -57,7 +57,8 @@ define KernelPackage/bluetooth
$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
$(LINUX_DIR)/drivers/bluetooth/btusb.ko \
$(LINUX_DIR)/drivers/bluetooth/btintel.ko \
- $(LINUX_DIR)/drivers/bluetooth/btrtl.ko
+ $(LINUX_DIR)/drivers/bluetooth/btrtl.ko \
+ $(LINUX_DIR)/drivers/bluetooth/btmtk.ko at ge5.17
AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
endef
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 2561f36aa3..f9b00fabd8 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1155,7 +1155,9 @@ $(eval $(call KernelPackage,usb-net-aqc111))
define KernelPackage/usb-net-asix
TITLE:=Kernel module for USB-to-Ethernet Asix convertors
- DEPENDS:=+kmod-libphy +kmod-net-selftests +kmod-mdio-devres +kmod-phy-ax88796b
+ DEPENDS:= \
+ +kmod-libphy +kmod-net-selftests +kmod-mdio-devres +kmod-phy-ax88796b \
+ +LINUX_6_1:kmod-phylink
KCONFIG:=CONFIG_USB_NET_AX8817X
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
AUTOLOAD:=$(call AutoProbe,asix)
More information about the lede-commits
mailing list