Upgrade linux kernel to 6.12.41 (LTS)

2026-07-22 01:13:00 +02:00 · 2025-08-12 11:39:53 +02:00
parent de4db3e6bc
commit fcce71fe23
35 changed files with 134 additions and 61 deletions
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"
@@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.35"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -8,6 +8,7 @@ All notable changes to the project are documented in this file.

 ### Changes
 - Upgrade Buildroot to 2025.02.5 (LTS)
+- Upgrade Linux kernel to 6.12.41 (LTS)
 - Raspberry Pi 4 is now a part of the aarch64 image, as well as a SDcard
  image for initial deployments.

@@ -1,7 +1,7 @@
-From 072c2f0732bc1a55aaeb9b5319a71bb472e2fd7d Mon Sep 17 00:00:00 2001
+From 3c9420a26d0a733f957e0b0b5de418775848c53f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
-Subject: [PATCH 01/27] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
+Subject: [PATCH 01/28] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
 PPU on 6393X
 Organization: Wires

@@ -1,7 +1,7 @@
-From 7b18b787450759f1c2507c7b65c81c3686040c90 Mon Sep 17 00:00:00 2001
+From 5098f1a2c354298d076a2fd3b648a075d763b4d4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
-Subject: [PATCH 02/27] net: dsa: mv88e6xxx: Improve indirect register access
+Subject: [PATCH 02/28] net: dsa: mv88e6xxx: Improve indirect register access
 perf on 6393
 Organization: Wires

@@ -1,7 +1,7 @@
-From 379dd2a00dc647b034befead65b26e467e63ae75 Mon Sep 17 00:00:00 2001
+From ea391b706ca007c6b7ef5cb94eae03c8b062ebfc Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
-Subject: [PATCH 03/27] net: dsa: mv88e6xxx: Honor ports being managed via
+Subject: [PATCH 03/28] net: dsa: mv88e6xxx: Honor ports being managed via
 in-band-status
 Organization: Wires

@@ -1,7 +1,7 @@
-From fd676f49b5aa5a1d372446be9ee01d1f126bcd54 Mon Sep 17 00:00:00 2001
+From d5dc80b6f8c94d2d96ef77c92a7bfcbf076b3851 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
-Subject: [PATCH 04/27] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
+Subject: [PATCH 04/28] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
 ports on 6393X
 Organization: Wires

@@ -1,7 +1,7 @@
-From 2aeb87ab82b7b9fb37e6b1c830dec5374158aa5d Mon Sep 17 00:00:00 2001
+From 3d707ace92c9b68c2fe3c41ce8a1c494066da17c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
-Subject: [PATCH 05/27] net: dsa: mv88e6xxx: Add LED infrastructure
+Subject: [PATCH 05/28] net: dsa: mv88e6xxx: Add LED infrastructure
 Organization: Wires

 Parse DT for LEDs and register them for devices that support it,
@@ -1,7 +1,7 @@
-From 3de6f58239d6b09c3fe1e0978a556481be8f3a95 Mon Sep 17 00:00:00 2001
+From ffad61ab5c619bcedda386797e9ae0bf4054efa4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
-Subject: [PATCH 06/27] net: dsa: mv88e6xxx: Add LED support for 6393X
+Subject: [PATCH 06/28] net: dsa: mv88e6xxx: Add LED support for 6393X
 Organization: Wires

 Trigger support:
@@ -1,7 +1,7 @@
-From f28803088158ddf97186f143f4bdc516e42e9354 Mon Sep 17 00:00:00 2001
+From d2b754cbbe19aa8f1d069fa3c2a6823bee8c2920 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
-Subject: [PATCH 07/27] net: dsa: tag_dsa: Use tag priority as initial
+Subject: [PATCH 07/28] net: dsa: tag_dsa: Use tag priority as initial
 skb->priority
 Organization: Wires

@@ -1,7 +1,7 @@
-From bbbf265610459ec49afcde923d1872ca3e2ad679 Mon Sep 17 00:00:00 2001
+From 98b74c2e6fac87118c97b676c426bb7c8effccbe Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
-Subject: [PATCH 08/27] net: dsa: Support MDB memberships whose L2 addresses
+Subject: [PATCH 08/28] net: dsa: Support MDB memberships whose L2 addresses
 overlap
 Organization: Wires

@@ -1,7 +1,7 @@
-From 797ed124853b8f0ef6d110e1633be2637c97c31d Mon Sep 17 00:00:00 2001
+From 7542f09844def85bd58033bb37bb6e6cc6ff697d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
-Subject: [PATCH 09/27] net: dsa: Support EtherType based priority overrides
+Subject: [PATCH 09/28] net: dsa: Support EtherType based priority overrides
 Organization: Wires

 ---
@@ -1,7 +1,7 @@
-From ea2d865a2101317e22c60143e891d643feac8e8c Mon Sep 17 00:00:00 2001
+From be63e969dc9bd07c799c6b7a3b582f574b87feee Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
-Subject: [PATCH 10/27] net: dsa: mv88e6xxx: Support EtherType based priority
+Subject: [PATCH 10/28] net: dsa: mv88e6xxx: Support EtherType based priority
 overrides
 Organization: Wires

@@ -1,7 +1,7 @@
-From a239baf492b7c4a1280562bb9478006627b73036 Mon Sep 17 00:00:00 2001
+From 3f51b144a86bd1b7f14c096898d3f1eda2348694 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
-Subject: [PATCH 11/27] net: dsa: mv88e6xxx: Add mqprio qdisc support
+Subject: [PATCH 11/28] net: dsa: mv88e6xxx: Add mqprio qdisc support
 Organization: Wires

 Add support for attaching mqprio qdisc's to mv88e6xxx ports and use
@@ -1,7 +1,7 @@
-From 60ac4461cef9b2024df52c23a040b100093ba1d7 Mon Sep 17 00:00:00 2001
+From 66b772317403bb070a3410333cb99288df23875f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
-Subject: [PATCH 12/27] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
+Subject: [PATCH 12/28] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
 are available
 Organization: Wires

@@ -1,7 +1,7 @@
-From d3b20e07514928830034d4af2eb7660bfcacc1e0 Mon Sep 17 00:00:00 2001
+From ff65351a4192e69eda3ba715424feb63596e52d7 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
-Subject: [PATCH 13/27] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
+Subject: [PATCH 13/28] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
 VLANs
 Organization: Wires

@@ -1,7 +1,7 @@
-From b4870c7df5d6659da439e8f1322dd5496a15445e Mon Sep 17 00:00:00 2001
+From 65f7b75b779691053f1993233e104c7bcd57ec72 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
-Subject: [PATCH 14/27] net: phy: marvell10g: Support firmware loading on
+Subject: [PATCH 14/28] net: phy: marvell10g: Support firmware loading on
 88X3310
 Organization: Wires

@@ -1,7 +1,7 @@
-From 6161b59334064ebfc0b80b0214fa12e6d042400e Mon Sep 17 00:00:00 2001
+From db990b4ffc543a2234116d47a5e85ee95b05b5e9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
-Subject: [PATCH 15/27] net: phy: marvell10g: Fix power-up when strapped to
+Subject: [PATCH 15/28] net: phy: marvell10g: Fix power-up when strapped to
 start powered down
 Organization: Wires

@@ -1,7 +1,7 @@
-From 403075caa172cf8e5c50346a86698b0a909a9263 Mon Sep 17 00:00:00 2001
+From c3851e92b6cf9ed1bd4c3d8b2b33d10f6aadbcf0 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
-Subject: [PATCH 16/27] net: phy: marvell10g: Add LED support for 88X3310
+Subject: [PATCH 16/28] net: phy: marvell10g: Add LED support for 88X3310
 Organization: Wires

 Pickup the LEDs from the state in which the hardware reset or
@@ -1,7 +1,7 @@
-From 84ca381445809f1d796c461a5b085ff4a3b7f93e Mon Sep 17 00:00:00 2001
+From d87176a8d2655d2bf049744626845fa4e79e2695 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
-Subject: [PATCH 17/27] net: phy: marvell10g: Support LEDs tied to a single
+Subject: [PATCH 17/28] net: phy: marvell10g: Support LEDs tied to a single
 media side
 Organization: Wires

@@ -1,7 +1,7 @@
-From 47eddfb80fd6bbbc186b0d8a93697c36840168e8 Mon Sep 17 00:00:00 2001
+From 0b37ca9039fa95d270230206f8d5f68d68fc41b3 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
-Subject: [PATCH 18/27] net: phy: Do not resume PHY when attaching
+Subject: [PATCH 18/28] net: phy: Do not resume PHY when attaching
 Organization: Wires

 The PHY should not start negotiating with its link-partner until
@@ -20,7 +20,7 @@ administratively down.
 1 file changed, 1 deletion(-)

 diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
-index 13dea33d86ff..25d0face304a 100644
+index 834624a61060..d09872e1ac4e 100644
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
@@ -1661,7 +1661,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
@@ -1,7 +1,7 @@
-From 761e5315fc2bac3809258e9719efd1475a73ac14 Mon Sep 17 00:00:00 2001
+From 0cd06cba7a3e9cfd4efa37db266a8b5d5b3b19fa Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 19/27] net: bridge: avoid classifying unknown multicast as
+Subject: [PATCH 19/28] net: bridge: avoid classifying unknown multicast as
 mrouters_only
 Organization: Wires

@@ -1,7 +1,7 @@
-From 41c6eeb5c4042027eac70243dd28bcaf963ac6b8 Mon Sep 17 00:00:00 2001
+From c5ee32858f05d987f876725030d8b7655244fb70 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 20/27] net: bridge: Ignore router ports when forwarding L2
+Subject: [PATCH 20/28] net: bridge: Ignore router ports when forwarding L2
 multicast
 Organization: Wires

@@ -1,7 +1,7 @@
-From f831362d0a5717cbb18a9173defca6ec4d886377 Mon Sep 17 00:00:00 2001
+From 97715025f5040138779c7cb384d51a7fa6f224b9 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 21/27] net: bridge: drop delay for applying strict multicast
+Subject: [PATCH 21/28] net: bridge: drop delay for applying strict multicast
 filtering
 Organization: Wires

@@ -1,7 +1,7 @@
-From 1e0eb62180058e98c7d18e3e04540925801e34b5 Mon Sep 17 00:00:00 2001
+From 85369df28e76f3a4f5ab714a163c7f7c6d54a7a1 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
-Subject: [PATCH 22/27] net: bridge: Differentiate MDB additions from
+Subject: [PATCH 22/28] net: bridge: Differentiate MDB additions from
 modifications
 Organization: Wires

@@ -1,7 +1,7 @@
-From 86a738ca46e019a8913d100138d8972681a65b4b Mon Sep 17 00:00:00 2001
+From deeaa6e29a24955839968ff1496e63cf19c68ce3 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
-Subject: [PATCH 23/27] nvmem: layouts: onie-tlv: Let device probe even when
+Subject: [PATCH 23/28] nvmem: layouts: onie-tlv: Let device probe even when
 TLV is invalid
 Organization: Wires

@@ -1,7 +1,7 @@
-From df19ceb2579bd87d58f2caab739d8ba678785f5c Mon Sep 17 00:00:00 2001
+From 9baf482d227725038fb3cb45c8867f572834fdde Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 29 Apr 2024 15:14:51 +0200
-Subject: [PATCH 24/27] usb: core: adjust log level for unauthorized devices
+Subject: [PATCH 24/28] usb: core: adjust log level for unauthorized devices
 Organization: Wires

 The fact that a USB device currently is not authorized is not an error,
@@ -1,7 +1,7 @@
-From eea7cb00b2e657445de9913736ff38b99ed0f9a5 Mon Sep 17 00:00:00 2001
+From 11833b5d736d3ca6ccad3b7b3cc859060a20523f Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
-Subject: [PATCH 25/27] net: dsa: mv88e6xxx: collapse disabled state into
+Subject: [PATCH 25/28] net: dsa: mv88e6xxx: collapse disabled state into
 blocking
 Organization: Wires

@@ -1,7 +1,7 @@
-From 0e24579e619a9d3ebb03293822092e03d16d6ad2 Mon Sep 17 00:00:00 2001
+From 0ee7fad47096411012f1f6b2ee6d0977e53f82b6 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
-Subject: [PATCH 26/27] net: dsa: mv88e6xxx: Only activate LAG offloading when
+Subject: [PATCH 26/28] net: dsa: mv88e6xxx: Only activate LAG offloading when
 bridged
 Organization: Wires

@@ -1,7 +1,7 @@
-From 73b60d31a3318344428842c7368b2f1eb0c05596 Mon Sep 17 00:00:00 2001
+From 88b269d1202c6258122074c46da6a473ddbecd68 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
-Subject: [PATCH 27/27] net: usb: r8152: add r8153b support for link/activity
+Subject: [PATCH 27/28] net: usb: r8152: add r8153b support for link/activity
 LEDs
 Organization: Wires

@@ -0,0 +1,72 @@
+From 32f3c3f3d5ed0548190fbdd2c430d1592ce5ff09 Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Sun, 10 Aug 2025 18:52:54 +0200
+Subject: [PATCH 28/28] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to
+ match case
+Organization: Wires
+
+For ref. see: https://wiki.banana-pi.org/File:Bpi-r3_Metal_case.jpg
+
+Also, comment out gpio-keys (reset and wps) since they clash with with
+the PCIe controller.
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+---
+ .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts  | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
+index ed79ad1ae871..1c7c666e3173 100644
+--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
+@@ -46,7 +46,7 @@ fan: pwm-fan {
+ 		pwms = <&pwm 0 10000>;
+ 		status = "okay";
+ 	};
+-
+/*
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+@@ -62,7 +62,7 @@ wps-key {
+ 			gpios = <&pio 10 GPIO_ACTIVE_LOW>;
+ 		};
+ 	};
+-
+*/
+ 	/* i2c of the left SFP cage (wan) */
+ 	i2c_sfp1: i2c-gpio-0 {
+ 		compatible = "i2c-gpio";
+@@ -418,27 +418,27 @@ port@0 {
+ 
+ 		port@1 {
+ 			reg = <1>;
+-			label = "lan0";
+			label = "lan1";
+ 		};
+ 
+ 		port@2 {
+ 			reg = <2>;
+-			label = "lan1";
+			label = "lan2";
+ 		};
+ 
+ 		port@3 {
+ 			reg = <3>;
+-			label = "lan2";
+			label = "lan3";
+ 		};
+ 
+ 		port@4 {
+ 			reg = <4>;
+-			label = "lan3";
+			label = "lan4";
+ 		};
+ 
+ 		port5: port@5 {
+ 			reg = <5>;
+-			label = "lan4";
+			label = "sfp2";
+ 			phy-mode = "2500base-x";
+ 			sfp = <&sfp2>;
+ 			managed = "in-band-status";
@@ -1,2 +1,2 @@
 # Calculated with ../utils/kernel-refresh.sh
-sha256   05f4e0b01dde578c3328eb539d305cccec7b84e939f6dd5f21fdaf5f313da748  linux-6.12.35.tar.xz
+sha256   6b19a3ae99423de2416964d67251d745910277af258b4c4c63e88fd87dbf0e27  linux-6.12.41.tar.xz