ramips: switch to 6.1 kernel

We have had the testing kernel for several weeks now. Let's switch to 6.1 to have more testers. Additionally, 6.6 is already in the pipeline. Signed-off-by: Nick Hainke <vincent@systemli.org>
openwrt · Mar 12, 2024 · 1576474 · 1576474 · badulesia · Mar 12, 2024
1 parent 4468cae
commit 1576474
Show file tree

Hide file tree

Showing 70 changed files with 2 additions and 13,033 deletions.
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
@@ -10,8 +10,7 @@ BOARDNAME:=MediaTek Ralink MIPS
 SUBTARGETS:=mt7620 mt7621 mt76x8 rt288x rt305x rt3883
 FEATURES:=squashfs gpio
 
-KERNEL_PATCHVER:=5.15
-KERNEL_TESTING_PATCHVER:=6.1
+KERNEL_PATCHVER:=6.1
 
 define Target/Description
 	Build firmware images for Ralink RT288x/RT3xxx based boards.

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/ethtool.c
@@ -125,15 +125,10 @@ static u32 fe_get_link(struct net_device *dev)
 	return ethtool_op_get_link(dev);
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
 static int fe_set_ringparam(struct net_device *dev,
 			    struct ethtool_ringparam *ring,
 			    struct kernel_ethtool_ringparam *kernel_rp,
 			    struct netlink_ext_ack *extack)
-#else
-static int fe_set_ringparam(struct net_device *dev,
-			    struct ethtool_ringparam *ring)
-#endif
 {
 	struct fe_priv *priv = netdev_priv(dev);
 
@@ -153,15 +148,10 @@ static int fe_set_ringparam(struct net_device *dev,
 	return 0;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
 static void fe_get_ringparam(struct net_device *dev,
 			     struct ethtool_ringparam *ring,
 			     struct kernel_ethtool_ringparam *kernel_rp,
 			     struct netlink_ext_ack *extack)
-#else
-static void fe_get_ringparam(struct net_device *dev,
-			     struct ethtool_ringparam *ring)
-#endif
 {
 	struct fe_priv *priv = netdev_priv(dev);
 

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c
@@ -1636,11 +1636,7 @@ static int fe_probe(struct platform_device *pdev)
 		priv->tx_ring.tx_ring_size *= 4;
 		priv->rx_ring.rx_ring_size *= 4;
 	}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
 	netif_napi_add_weight(netdev, &priv->rx_napi, fe_poll, napi_weight);
-#else
-	netif_napi_add(netdev, &priv->rx_napi, fe_poll, napi_weight);
-#endif
 	fe_set_ethtool_ops(netdev);
 
 	err = register_netdev(netdev);

diff --git a/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c b/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c
@@ -1097,12 +1097,10 @@ static int aw9523_remove(struct i2c_client *client)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
 static void aw9523_remove_void(struct i2c_client *client)
 {
 	aw9523_remove(client);
 }
-#endif
 
 static const struct i2c_device_id aw9523_i2c_id_table[] = {
 	{ "aw9523_i2c", 0 },
@@ -1121,11 +1119,7 @@ static struct i2c_driver aw9523_driver = {
 		.of_match_table = of_aw9523_i2c_match,
 	},
 	.probe = aw9523_probe,
-	#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
 	.remove = aw9523_remove_void,
-	#else
-	.remove = aw9523_remove,
-	#endif
 	.id_table = aw9523_i2c_id_table,
 };
 module_i2c_driver(aw9523_driver);

diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk
@@ -101,8 +101,7 @@ define KernelPackage/hsdma-mtk
 	CONFIG_MTK_HSDMA
   FILES:= \
 	$(LINUX_DIR)/drivers/dma/virt-dma.ko \
-	$(LINUX_DIR)/drivers/staging/mt7621-dma/hsdma-mt7621.ko@lt5.17 \
-	$(LINUX_DIR)/drivers/dma/mediatek/hsdma-mt7621.ko@ge5.17
+	$(LINUX_DIR)/drivers/dma/mediatek/hsdma-mt7621.ko
   AUTOLOAD:=$(call AutoLoad,53,hsdma-mt7621)
 endef
 

diff --git a/...mips/patches-5.15/000-v5.18-01-dt-bindings-reset-add-dt-binding-header-for-Mediatek.patch b/...mips/patches-5.15/000-v5.18-01-dt-bindings-reset-add-dt-binding-header-for-Mediatek.patch
diff --git a/...mips/patches-5.15/000-v5.18-02-staging-mt7621-dts-align-resets-with-binding-documen.patch b/...mips/patches-5.15/000-v5.18-02-staging-mt7621-dts-align-resets-with-binding-documen.patch
diff --git a/...mips/patches-5.15/001-v5.18-01-dt-bindings-clock-mediatek-mt7621-sysc-add-reset-cel.patch b/...mips/patches-5.15/001-v5.18-01-dt-bindings-clock-mediatek-mt7621-sysc-add-reset-cel.patch