[openwrt/openwrt] mediatek: filogic: bpi-r3: set netdev-name for sfp1 port

[LEDE Commits]

aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/84fc59c0d5285a0a0fe50e3cb2a85f6224362c55

commit 84fc59c0d5285a0a0fe50e3cb2a85f6224362c55
Author: Jonas Jelonek <jelonek.jonas at gmail.com>
AuthorDate: Sun Nov 10 00:43:23 2024 +0000

    mediatek: filogic: bpi-r3: set netdev-name for sfp1 port
    
    Sets openwrt,netdev-name for the gmac1 node in the dts of BPI-R3, which
    corresponds to the sfp1 slot, to have a proper naming and match the
    label on the official BPI-R3 metal case. This renames the port from eth1
    to sfp1.
    The COMPAT_VERSION is increased to denote that configuration has to be
    adjusted manually.
    
    Signed-off-by: Jonas Jelonek <jelonek.jonas at gmail.com>
---
 .../linux/mediatek/filogic/base-files/etc/board.d/02_network   |  2 +-
 .../mediatek/filogic/base-files/etc/board.d/05_compat-version  |  2 +-
 target/linux/mediatek/image/filogic.mk                         |  4 ++--
 ...55-dts-mt7968a-bpi-r3-add-label-to-gmac-for-sfp1-port.patch | 10 ++++++++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index 2a13381326..85422fe1f6 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -59,7 +59,7 @@ mediatek_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1
 		;;
 	bananapi,bpi-r3)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "sfp1 wan"
 		;;
 	bananapi,bpi-r3-mini|\
 	edgecore,eap111)
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version b/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version
index 9b704b983c..48c040613c 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version
@@ -6,7 +6,7 @@ board_config_update
 
 case "$(board_name)" in
 	bananapi,bpi-r3)
-		ucidef_set_compat_version "1.2"
+		ucidef_set_compat_version "1.3"
 		;;
 	routerich,ax3000)
 		ucidef_set_compat_version "1.1"
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index 1fdb303677..825e4abbad 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -375,8 +375,8 @@ endif
 	fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
   IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | pad-rootfs | append-metadata
   DEVICE_DTC_FLAGS := --pad 4096
-  DEVICE_COMPAT_VERSION := 1.2
-  DEVICE_COMPAT_MESSAGE := SPI-NAND flash layout changes require bootloader update
+  DEVICE_COMPAT_VERSION := 1.3
+  DEVICE_COMPAT_MESSAGE := First sfp port renamed from eth1 to sfp1
 endef
 TARGET_DEVICES += bananapi_bpi-r3
 
diff --git a/target/linux/mediatek/patches-6.6/955-dts-mt7968a-bpi-r3-add-label-to-gmac-for-sfp1-port.patch b/target/linux/mediatek/patches-6.6/955-dts-mt7968a-bpi-r3-add-label-to-gmac-for-sfp1-port.patch
new file mode 100644
index 0000000000..f11cf01686
--- /dev/null
+++ b/target/linux/mediatek/patches-6.6/955-dts-mt7968a-bpi-r3-add-label-to-gmac-for-sfp1-port.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
+@@ -195,6 +195,7 @@
+ 		phy-mode = "2500base-x";
+ 		sfp = <&sfp1>;
+ 		managed = "in-band-status";
++		openwrt,netdev-name = "sfp1";
+ 	};
+ 
+ 	mdio: mdio-bus {