Skip to content

Commit e1eec52

Browse files
committed
mediatek: filogic: gl-mt2500 fix compatibles
Alternative fix for openwrt#20632 if we want to mantain the two profiles to be "compatible" each other. They shared the same compatible in device tree causing some incompatibilities (sysupgrades), assign a unique compatible and model to each variant. This is the minimal change in order to not modify the actual SUPPORTED_DEVICES. Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>
1 parent 1f879b8 commit e1eec52

7 files changed

Lines changed: 15 additions & 3 deletions

File tree

package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ acer,predator-w6|\
5454
acer,predator-w6d|\
5555
acer,vero-w6m|\
5656
glinet,gl-mt2500|\
57+
glinet,gl-mt2500-airoha|\
5758
glinet,gl-mt6000|\
5859
glinet,gl-x3000|\
5960
glinet,gl-xe3000|\

target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set_preinit_iface() {
55
cudy,tr3000-v1|\
66
cudy,tr3000-v1-ubootmod|\
77
glinet,gl-mt2500|\
8+
glinet,gl-mt2500-airoha|\
89
glinet,gl-mt3000|\
910
openembed,som7981|\
1011
wavlink,wl-wn573hx3)

target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500-v1.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
/dts-v1/;
44
#include "mt7981b-glinet-gl-mt2500.dtsi"
55

6+
/ {
7+
model = "GL.iNet GL-MT2500 v1 Maxlinear";
8+
compatible = "glinet,gl-mt2500", "mediatek,mt7981";
9+
}
10+
611
&gmac0 {
712
phy-handle = <&phy5>;
813
};

target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500-v2.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
/dts-v1/;
44
#include "mt7981b-glinet-gl-mt2500.dtsi"
55

6+
/ {
7+
model = "GL.iNet GL-MT2500 v2 Airoha";
8+
compatible = "glinet,gl-mt2500-airoha", "mediatek,mt7981";
9+
}
10+
611
&gmac0 {
712
phy-handle = <&phy13>;
813
};

target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
#include <dt-bindings/pinctrl/mt65xx.h>
66

77
/ {
8-
model = "GL.iNet GL-MT2500";
9-
compatible = "glinet,gl-mt2500", "mediatek,mt7981";
10-
118
aliases {
129
label-mac-device = &gmac0;
1310
led-boot = &led_sys_white;

target/linux/mediatek/filogic/base-files/etc/board.d/02_network

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ mediatek_setup_interfaces()
119119
cudy,tr3000-v1|\
120120
cudy,tr3000-v1-ubootmod|\
121121
glinet,gl-mt2500|\
122+
glinet,gl-mt2500-airoha|\
122123
glinet,gl-mt3000|\
123124
glinet,gl-x3000|\
124125
glinet,gl-xe3000|\

target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ platform_do_upgrade() {
123123
acer,vero-w6m|\
124124
arcadyan,mozart|\
125125
glinet,gl-mt2500|\
126+
glinet,gl-mt2500-airoha|\
126127
glinet,gl-mt6000|\
127128
glinet,gl-x3000|\
128129
glinet,gl-xe3000|\
@@ -338,6 +339,7 @@ platform_copy_config() {
338339
acer,vero-w6m|\
339340
arcadyan,mozart|\
340341
glinet,gl-mt2500|\
342+
glinet,gl-mt2500-airoha|\
341343
glinet,gl-mt6000|\
342344
glinet,gl-x3000|\
343345
glinet,gl-xe3000|\

0 commit comments

Comments
 (0)