From: Adrian Schmutzler Date: Thu, 26 Sep 2019 12:44:22 +0000 (+0200) Subject: ramips: harmonize device vendor Zbtlink X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b376818f97801dbdc72af1dd1ed45f1a01191d69;p=openwrt%2Fstaging%2Fwigyori.git ramips: harmonize device vendor Zbtlink Spelling of Zbtlink varies across image definitions and DTS files. This patch uses Zbtlink consistently and also updates the model in DTS files to contain the vendor in all cases. This patch is cosmetical, as there should be no dependencies on device model name in ramips anymore. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts index e2eb5b6329..a05e8d4b47 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts @@ -37,7 +37,7 @@ / { compatible = "zbtlink,we1026-5g-16m", "ralink,mt7620a-soc"; - model = "ZBT WE1026-5G (16M)"; + model = "Zbtlink ZBT-WE1026-5G (16M)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index 70ad0f0b58..665dd5ba3c 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-ape522ii", "ralink,mt7620a-soc"; - model = "ZBT-APE522II"; + model = "Zbtlink ZBT-APE522II"; chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts index 7f2b2646b2..d115b8a096 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-16m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-we826-16m", "zbtlink,zbt-we826", "ralink,mt7620a-soc"; - model = "ZBT-WE826 (16M)"; + model = "Zbtlink ZBT-WE826 (16M)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts index e7cdcab5e9..94a67dd5de 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-32m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-we826-32m", "zbtlink,zbt-we826", "ralink,mt7620a-soc"; - model = "ZBT-WE826 (32M)"; + model = "Zbtlink ZBT-WE826 (32M)"; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts index 243126125b..2496a16a29 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts @@ -5,7 +5,7 @@ / { compatible = "zbtlink,zbt-we826-e", "zbtlink,zbt-we826", "ralink,mt7620a-soc"; - model = "ZBT-WE826-E"; + model = "Zbtlink ZBT-WE826-E"; /delete-node/ leds; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts index 819c851c73..d7c48c6d9f 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-we1326", "mediatek,mt7621-soc"; - model = "ZBT-WE1326"; + model = "Zbtlink ZBT-WE1326"; aliases { label-mac-device = &wifi1; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts index 7973626fad..b1d3e4e812 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-we3526", "mediatek,mt7621-soc"; - model = "ZBT-WE3526"; + model = "Zbtlink ZBT-WE3526"; chosen { bootargs = "console=ttyS0,115200"; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts index ca2044f73e..1a2a89a31e 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts @@ -7,7 +7,7 @@ / { compatible = "zbtlink,zbt-wg2626", "mediatek,mt7621-soc"; - model = "ZBT-WG2626"; + model = "Zbtlink ZBT-WG2626"; aliases { led-boot = &led_status; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts index 9bf8b9bdb2..a9bd9180fd 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-16m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-wg3526-16m", "zbtlink,zbt-wg3526", "mediatek,mt7621-soc"; - model = "ZBT-WG3526 (16M)"; + model = "Zbtlink ZBT-WG3526 (16M)"; }; &firmware { diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts index 8e49e48b2b..e7add46d32 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526-32m.dts @@ -4,7 +4,7 @@ / { compatible = "zbtlink,zbt-wg3526-32m", "zbtlink,zbt-wg3526", "mediatek,mt7621-soc"; - model = "ZBT-WG3526 (32M)"; + model = "Zbtlink ZBT-WG3526 (32M)"; }; &firmware { diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 816652ddaa..582fe3284e 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -805,7 +805,7 @@ TARGET_DEVICES += youku_yk-l2 define Device/zbtlink_zbt-we1326 MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1326 DEVICE_PACKAGES := \ kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-basic @@ -816,7 +816,7 @@ TARGET_DEVICES += zbtlink_zbt-we1326 define Device/zbtlink_zbt-we3526 MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE3526 DEVICE_PACKAGES := \ kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ @@ -827,7 +827,7 @@ TARGET_DEVICES += zbtlink_zbt-we3526 define Device/zbtlink_zbt-wg2626 MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG2626 DEVICE_PACKAGES := \ kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ @@ -839,7 +839,7 @@ TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m MTK_SOC := mt7621 IMAGE_SIZE := 16064k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 16M DEVICE_PACKAGES := \ @@ -852,7 +852,7 @@ TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m MTK_SOC := mt7621 IMAGE_SIZE := 32448k - DEVICE_VENDOR := ZBT + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 32M DEVICE_PACKAGES := \ diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 3179adc472..9ab16db064 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -578,7 +578,7 @@ TARGET_DEVICES += xiaomi_miwifi-nano define Device/zbtlink_zbt-we1226 MTK_SOC := mt7628an IMAGE_SIZE := 7872k - DEVICE_VENDOR := ZBTlink + DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1226 endef TARGET_DEVICES += zbtlink_zbt-we1226