From 400e56d22c9faddccfb429f16885536bcc31f06d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 26 Sep 2019 14:44:23 +0200 Subject: [PATCH] ramips: apply consistent device name/compatible to ZBT-WE1026-5G All Zbtlink ramips devices except the ZBT-WE1026-5G include the zbt-/ZBT- prefix in their model name. This changes ZBT-WE1026-5G to also follow that scheme. The patch moves some block to keep alphatical order. Signed-off-by: Adrian Schmutzler --- .../ramips/base-files/etc/board.d/01_leds | 8 +++---- .../ramips/base-files/etc/board.d/02_network | 2 +- ... => mt7620a_zbtlink_zbt-we1026-5g-16m.dts} | 4 ++-- ...tsi => mt7620a_zbtlink_zbt-we1026-5g.dtsi} | 2 +- target/linux/ramips/image/mt7620.mk | 22 +++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) rename target/linux/ramips/dts/{mt7620a_zbtlink_we1026-5g-16m.dts => mt7620a_zbtlink_zbt-we1026-5g-16m.dts} (95%) rename target/linux/ramips/dts/{mt7620a_zbtlink_we1026-5g.dtsi => mt7620a_zbtlink_zbt-we1026-5g.dtsi} (98%) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 46202b4117..f8a270b6b0 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -445,10 +445,6 @@ youku,yk1) set_wifi_led "$boardname:blue:air" ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10" ;; -zbtlink,we1026-5g-16m) - ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0" - set_wifi_led "we1026-5g:green:wifi" - ;; zbtlink,zbt-ape522ii) ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1" ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx" @@ -461,6 +457,10 @@ zbtlink,zbt-we826-16m|\ zbtlink,zbt-we826-32m) set_wifi_led "zbt-we826:green:wifi" ;; +zbtlink,zbt-we1026-5g-16m) + ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0" + set_wifi_led "we1026-5g:green:wifi" + ;; zbtlink,zbt-we1226) set_wifi_led "$boardname:green:wlan" ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x01" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 947bf1428d..ae05c827bc 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -451,7 +451,7 @@ ramips_setup_interfaces() "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "9@eth0" ;; sparklan,wcr-150gn|\ - zbtlink,we1026-5g-16m) + zbtlink,zbt-we1026-5g-16m) ucidef_add_switch "switch0" \ "0:lan" "6t@eth0" ;; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g-16m.dts similarity index 95% rename from target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts rename to target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g-16m.dts index a05e8d4b47..feba29763b 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g-16m.dts @@ -33,10 +33,10 @@ /dts-v1/; -#include "mt7620a_zbtlink_we1026-5g.dtsi" +#include "mt7620a_zbtlink_zbt-we1026-5g.dtsi" / { - compatible = "zbtlink,we1026-5g-16m", "ralink,mt7620a-soc"; + compatible = "zbtlink,zbt-we1026-5g-16m", "ralink,mt7620a-soc"; model = "Zbtlink ZBT-WE1026-5G (16M)"; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi similarity index 98% rename from target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi rename to target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi index e7e64e251a..68a74ede39 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi @@ -37,7 +37,7 @@ #include / { - compatible = "zbtlink,we1026-5g", "ralink,mt7620a-soc"; + compatible = "zbtlink,zbt-we1026-5g", "ralink,mt7620a-soc"; chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 36898c99bc..6543958bd0 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -943,17 +943,6 @@ define Device/yukai_bocco endef TARGET_DEVICES += yukai_bocco -define Device/zbtlink_we1026-5g-16m - MTK_SOC := mt7620a - IMAGE_SIZE := 16064k - DEVICE_VENDOR := Zbtlink - DEVICE_MODEL := ZBT-WE1026-5G - DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 - SUPPORTED_DEVICES += we1026-5g-16m -endef -TARGET_DEVICES += zbtlink_we1026-5g-16m - define Device/zbtlink_zbt-ape522ii MTK_SOC := mt7620a IMAGE_SIZE := 15872k @@ -984,6 +973,17 @@ define Device/zbtlink_zbt-wa05 endef TARGET_DEVICES += zbtlink_zbt-wa05 +define Device/zbtlink_zbt-we1026-5g-16m + MTK_SOC := mt7620a + IMAGE_SIZE := 16064k + DEVICE_VENDOR := Zbtlink + DEVICE_MODEL := ZBT-WE1026-5G + DEVICE_VARIANT := 16M + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 + SUPPORTED_DEVICES += we1026-5g-16m zbtlink,we1026-5g-16m +endef +TARGET_DEVICES += zbtlink_zbt-we1026-5g-16m + define Device/zbtlink_zbt-we2026 MTK_SOC := mt7620n IMAGE_SIZE := 7552k -- 2.25.1