treewide: rename ZyXEL to Zyxel

The company Zyxel rebranded some years ago.
Currently the casing is according to the old branding even
for newer devices which already use the new branding.

This commit aligns the casing of Zyxel everywhere.

Signed-off-by: Goetz Goerisch <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/15652
Signed-off-by: Hauke Mehrtens <[email protected]>

package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch

@@ -1,9 +1,9 @@
 
-arm: kirkwood: add ZyXEL NSA310 device
+arm: kirkwood: add Zyxel NSA310 device
 
-This patch add ZyXEL NSA310 1-Bay Media Server
+This patch add Zyxel NSA310 1-Bay Media Server
 
-The ZyXEL NSA310 device is a Kirkwood based NAS:
+The Zyxel NSA310 device is a Kirkwood based NAS:
 
 - SoC: Marvell 88F6702 1200Mhz
 - SDRAM memory: 256MB DDR2 400Mhz
@@ -512,7 +512,7 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in
 +CONFIG_KIRKWOOD=y
 +CONFIG_SYS_TEXT_BASE=0x600000
 +CONFIG_TARGET_NSA310=y
-+CONFIG_IDENT_STRING="\nZyXEL NSA310 1-Bay Power Media Server"
++CONFIG_IDENT_STRING="\nZyxel NSA310 1-Bay Power Media Server"
 +CONFIG_NR_DRAM_BANKS=2
 +CONFIG_BOOTDELAY=3
 +CONFIG_SYS_PROMPT="NSA310> "

package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch

@@ -297,7 +297,7 @@
 +	/* reset the phy */
 +	miiphy_reset(name, devadr);
 +
-+	/* The ZyXEL NSA325 uses the 88E1310S Alaska (interface identical to 88E1318) */
++	/* The Zyxel NSA325 uses the 88E1310S Alaska (interface identical to 88E1318) */
 +	/* and has an MCU attached to the LED[2] via tristate interrupt */
 +	reg = 0;
 +
@@ -496,7 +496,7 @@
 +CONFIG_KIRKWOOD=y
 +CONFIG_SYS_TEXT_BASE=0x600000
 +CONFIG_TARGET_NSA325=y
-+CONFIG_IDENT_STRING="\nZyXEL NSA325 2-Bay Power Media Server"
++CONFIG_IDENT_STRING="\nZyxel NSA325 2-Bay Power Media Server"
 +CONFIG_NR_DRAM_BANKS=2
 +CONFIG_BOOTDELAY=3
 +CONFIG_SYS_PROMPT="NSA325> "

package/boot/uboot-lantiq/Makefile

@@ -280,14 +280,14 @@ define U-Boot/fb3370_sfspl
 endef
 
 define U-Boot/p2812hnufx_ram
-  NAME:=ZyXEL P-2812HNU-Fx (RAM)
+  NAME:=Zyxel P-2812HNU-Fx (RAM)
   BUILD_SUBTARGET:=xrx200
   BUILD_DEVICES:=zyxel_p-2812hnu-f1
   DDR_SETTINGS:=board/zyxel/p2812hnufx/ddr_settings.h
 endef
 
 define U-Boot/p2812hnufx_nandspl
-  NAME:=ZyXEL P-2812HNU-Fx (NAND SPL)
+  NAME:=Zyxel P-2812HNU-Fx (NAND SPL)
   BUILD_SUBTARGET:=xrx200
   BUILD_DEVICES:=zyxel_p-2812hnu-f1
   UBOOT_IMAGE:=u-boot.ltq.lzo.nandspl

package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch

@@ -1,7 +1,7 @@
 From 3f7be04a148d23cdb5fd320e0e2923983f8bd1f4 Mon Sep 17 00:00:00 2001
 From: Luka Perkov <[email protected]>
 Date: Tue, 6 Aug 2013 22:51:00 +0200
-Subject: MIPS: add board support for ZyXEL P-2812HNU-Fx
+Subject: MIPS: add board support for Zyxel P-2812HNU-Fx
 
 Signed-off-by: Luka Perkov <[email protected]>
 
@@ -51,7 +51,7 @@ Signed-off-by: Luka Perkov <[email protected]>
 +/*
 + * Copyright (C) 2013 Luka Perkov <[email protected]>
 + *
-+ * The values have been extracted from original ZyXEL U-Boot.
++ * The values have been extracted from original Zyxel U-Boot.
 + *
 + * SPDX-License-Identifier:	GPL-2.0+
 + */
@@ -243,7 +243,7 @@ Signed-off-by: Luka Perkov <[email protected]>
 +
 +#define CONFIG_MACH_TYPE	"P-2812HNU-Fx"
 +#define CONFIG_IDENT_STRING	" "CONFIG_MACH_TYPE
-+#define CONFIG_BOARD_NAME	"ZyXEL P-2812HNU-Fx"
++#define CONFIG_BOARD_NAME	"Zyxel P-2812HNU-Fx"
 +
 +/* Configure SoC */
 +#define CONFIG_LTQ_SUPPORT_UART			/* Enable ASC and UART */

package/kernel/mt7621-qtn-rgmii/Makefile

@@ -29,7 +29,7 @@ endef
 define KernelPackage/mt7621-qtn-rgmii/description
   Enable RGMII connected Quantenna module on MT7621.
 
-  The Mitrastar designed ZyXEL WAP6805 has a Quantenna QV840
+  The Mitrastar designed Zyxel WAP6805 has a Quantenna QV840
   module connected to the RGMII pins of the MT7621 SoC. For
   unknown reasons, it is necessary to change the value of
   the register at 0x1e110008 from default (usually 0xc000c)

package/utils/zyxel-bootconfig/Makefile

@@ -15,12 +15,12 @@ include $(INCLUDE_DIR)/package.mk
 define Package/zyxel-bootconfig
   SECTION:=utils
   CATEGORY:=Base system
-  TITLE:=Utility for handling ZyXEL Bootconfig settings
+  TITLE:=Utility for handling Zyxel Bootconfig settings
   MAINTAINER:=David Bauer <[email protected]>
 endef
 
 define Package/zyxel-bootconfig/description
- This package contains an utility that allows handling ZyXEL Bootconfig settings.
+ This package contains an utility that allows handling Zyxel Bootconfig settings.
 endef
 
 define Build/Compile

target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,nbg6616", "qca,qca9557";
-	model = "ZyXEL NBG6616";
+	model = "Zyxel NBG6616";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ath79/dts/qca9558_zyxel_emg2926_q10a.dts

@@ -4,5 +4,5 @@
 
 / {
 	compatible = "zyxel,emg2926-q10a", "zyxel,nbg6716", "qca,qca9558";
-	model = "ZyXEL EMG2926-Q10A";
+	model = "Zyxel EMG2926-Q10A";
 };

target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,nbg6716", "qca,qca9558";
-	model = "ZyXEL NBG6716";
+	model = "Zyxel NBG6716";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ath79/image/generic.mk

@@ -3262,7 +3262,7 @@ TARGET_DEVICES += zbtlink_zbt-wd323
 define Device/zyxel_nwa11xx
   $(Device/loader-okli-uimage)
   SOC := ar9342
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   LOADER_FLASH_OFFS := 0x050000
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49
   IMAGE_SIZE := 8192k
@@ -3309,7 +3309,7 @@ TARGET_DEVICES += zyxel_nwa1123-ni
 
 define Device/zyxel_nbg6616
   SOC := qca9557
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NBG6616
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-rtc-pcf8563 \
 	kmod-ath10k-ct ath10k-firmware-qca988x-ct

target/linux/ath79/image/nand.mk

@@ -487,7 +487,7 @@ TARGET_DEVICES += zte_mf286r
 
 define Device/zyxel_nbg6716
   SOC := qca9558
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NBG6716
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
 	ath10k-firmware-qca988x-ct

target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch

@@ -1541,7 +1541,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 +zidoo	Shenzhen Zidoo Technology Co., Ltd.
 +zii	Zodiac Inflight Innovations
 +zte	ZTE Corp.
-+zyxel	ZyXEL Communications Corp.
++zyxel	Zyxel Communications Corp.
 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
 @@ -196,6 +196,8 @@ patternProperties:

target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-nbg6617.dts

@@ -8,7 +8,7 @@
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
-	model = "ZyXEL NBG6617";
+	model = "Zyxel NBG6617";
 	compatible = "zyxel,nbg6617";
 
 	chosen {
@@ -239,7 +239,7 @@
 			partition12@6a0000 {
 				label = "not_root_data";
 				/*
-				 * for some strange reason, someone at ZyXEL
+				 * for some strange reason, someone at Zyxel
 				 * had the "great" idea to put the rootfs_data
 				 * in front of rootfs... Don't do that!
 				 * As a result this one, full MebiByte remains

target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wre6606.dts

@@ -22,7 +22,7 @@
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
-	model = "ZyXEL WRE6606";
+	model = "Zyxel WRE6606";
 	compatible = "zyxel,wre6606";
 
 	aliases {

target/linux/ipq40xx/image/generic.mk

@@ -1279,7 +1279,7 @@ TARGET_DEVICES += zte_mf289f
 
 define Device/zyxel_nbg6617
 	$(call Device/FitImageLzma)
-	DEVICE_VENDOR := ZyXEL
+	DEVICE_VENDOR := Zyxel
 	DEVICE_MODEL := NBG6617
 	SOC := qcom-ipq4018
 	KERNEL_SIZE := 4096k
@@ -1289,7 +1289,7 @@ define Device/zyxel_nbg6617
 	RAS_VERSION := "$(VERSION_DIST) $(REVISION)"
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
 	IMAGES += factory.bin
-#	The ZyXEL firmware allows flashing thru the web-gui only when the rootfs is
+#	The Zyxel firmware allows flashing thru the web-gui only when the rootfs is
 #	at least as large as the one of the initial firmware image (not the current
 #	one on the device). This only applies to the Web-UI, the bootlaoder ignores
 #	this minimum-size. However, the larger image can be flashed both ways.
@@ -1301,7 +1301,7 @@ TARGET_DEVICES += zyxel_nbg6617
 
 define Device/zyxel_wre6606
 	$(call Device/FitImage)
-	DEVICE_VENDOR := ZyXEL
+	DEVICE_VENDOR := Zyxel
 	DEVICE_MODEL := WRE6606
 	DEVICE_DTS_CONFIG := config@4
 	SOC := qcom-ipq4018

target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts

@@ -4,7 +4,7 @@
 #include <dt-bindings/leds/common.h>
 
 / {
-	model = "ZyXEL NBG6817";
+	model = "Zyxel NBG6817";
 	compatible = "zyxel,nbg6817", "qcom,ipq8065", "qcom,ipq8064";
 
 	memory@0 {

target/linux/ipq806x/image/generic.mk

@@ -74,7 +74,7 @@ define Device/TpSafeImage
 		tplink-safeloader sysupgrade | append-metadata
 endef
 
-define Device/ZyXELImage
+define Device/ZyxelImage
 	KERNEL_SUFFIX := -uImage
 	KERNEL = kernel-bin | append-dtb | uImage none | \
 		pad-to $$(KERNEL_SIZE)
@@ -578,7 +578,7 @@ TARGET_DEVICES += ubnt_unifi-ac-hd
 
 define Device/zyxel_nbg6817
 	$(Device/dsa-migration)
-	DEVICE_VENDOR := ZyXEL
+	DEVICE_VENDOR := Zyxel
 	DEVICE_MODEL := NBG6817
 	SOC := qcom-ipq8065
 	KERNEL_SIZE := 4096k
@@ -590,6 +590,6 @@ define Device/zyxel_nbg6817
 	SUPPORTED_DEVICES += nbg6817
 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct e2fsprogs \
 		kmod-fs-ext4 losetup
-	$(call Device/ZyXELImage)
+	$(call Device/ZyxelImage)
 endef
 TARGET_DEVICES += zyxel_nbg6817

target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nsa310b.dts

@@ -8,7 +8,7 @@
  */
 
 / {
-	model = "ZyXEL NSA310b";
+	model = "Zyxel NSA310b";
 	compatible = "zyxel,nsa310b", "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	aliases {

target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nsa310b.dts

@@ -8,7 +8,7 @@
  */
 
 / {
-	model = "ZyXEL NSA310b";
+	model = "Zyxel NSA310b";
 	compatible = "zyxel,nsa310b", "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	aliases {

target/linux/kirkwood/image/Makefile

@@ -373,7 +373,7 @@ endef
 TARGET_DEVICES += seagate_goflexhome
 
 define Device/zyxel_nsa310b
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NSA310b
   DEVICE_PACKAGES := kmod-ata-marvell-sata kmod-r8169 kmod-fs-ext4 \
 	kmod-gpio-button-hotplug kmod-hwmon-lm85 kmod-rtc-mv
@@ -382,7 +382,7 @@ endef
 TARGET_DEVICES += zyxel_nsa310b
 
 define Device/zyxel_nsa310s
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NSA310S
   DEVICE_PACKAGES := kmod-ata-marvell-sata kmod-fs-ext4 \
 	kmod-gpio-button-hotplug kmod-rtc-mv
@@ -390,7 +390,7 @@ endef
 TARGET_DEVICES += zyxel_nsa310s
 
 define Device/zyxel_nsa325
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NSA325
   DEVICE_VARIANT := v1/v2
   DEVICE_PACKAGES := kmod-ata-marvell-sata kmod-fs-ext4 \

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts

@@ -5,7 +5,7 @@
 
 / {
 	compatible = "zyxel,p-2601hn", "lantiq,xway", "lantiq,ar9";
-	model = "ZyXEL P-2601HN-Fx";
+	model = "Zyxel P-2601HN-Fx";
 
 	chosen {
 		bootargs = "console=ttyLTQ0,115200";

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts

@@ -2,7 +2,7 @@
 
 / {
 	compatible = "zyxel,p-2812hnu-f1", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
-	model = "ZyXEL P-2812HNU-F1";
+	model = "Zyxel P-2812HNU-F1";
 
 	leds {
 		usb1 {

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts

@@ -2,7 +2,7 @@
 
 / {
 	compatible = "zyxel,p-2812hnu-f3", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
-	model = "ZyXEL P-2812HNU-F3";
+	model = "Zyxel P-2812HNU-F3";
 };
 
 &pci0 {

target/linux/lantiq/image/ar9.mk

@@ -159,7 +159,7 @@ endef
 TARGET_DEVICES += zte_h201l
 
 define Device/zyxel_p-2601hn
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := P-2601HN
   DEVICE_VARIANT := F1/F3
   IMAGE_SIZE := 15616k

target/linux/lantiq/image/vr9.mk

@@ -370,7 +370,7 @@ TARGET_DEVICES += netgear_dm200
 define Device/zyxel_p-2812hnu-f1
   $(Device/dsa-migration)
   $(Device/NAND)
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := P-2812HNU
   DEVICE_VARIANT := F1
   BOARD_NAME := P2812HNUF1
@@ -384,7 +384,7 @@ TARGET_DEVICES += zyxel_p-2812hnu-f1
 define Device/zyxel_p-2812hnu-f3
   $(Device/dsa-migration)
   $(Device/NAND)
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := P-2812HNU
   DEVICE_VARIANT := F3
   BOARD_NAME := P2812HNUF3

target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts

@@ -4,7 +4,7 @@
 #include "mt7981.dtsi"
 
 / {
-	model = "ZyXEL NWA50AX Pro";
+	model = "Zyxel NWA50AX Pro";
 	compatible = "zyxel,nwa50ax-pro", "mediatek,mt7981";
 
 	aliases {

target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts

@@ -8,7 +8,7 @@
 #include "mt7986a.dtsi"
 
 / {
-	model = "ZyXEL EX5700 (Telenor)";
+	model = "Zyxel EX5700 (Telenor)";
 	compatible = "zyxel,ex5700-telenor", "mediatek,mt7986a";
 
 	aliases {

target/linux/mediatek/image/filogic.mk

@@ -1461,7 +1461,7 @@ endef
 TARGET_DEVICES += zyxel_ex5601-t0-ubootmod
 
 define Device/zyxel_ex5700-telenor
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := EX5700 (Telenor)
   DEVICE_DTS := mt7986a-zyxel-ex5700-telenor
   DEVICE_DTS_DIR := ../dts
@@ -1475,7 +1475,7 @@ endef
 TARGET_DEVICES += zyxel_ex5700-telenor
 
 define Device/zyxel_nwa50ax-pro
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NWA50AX Pro
   DEVICE_DTS := mt7981b-zyxel-nwa50ax-pro
   DEVICE_DTS_DIR := ../dts

target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,keenetic-viva", "ralink,mt7620a-soc";
-	model = "ZyXEL Keenetic Viva";
+	model = "Zyxel Keenetic Viva";
 
 	aliases {
 		led-boot = &led_power_green;

target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts

@@ -8,7 +8,7 @@
 
 / {
 	compatible = "zyxel,keenetic-lite-iii-a", "ralink,mt7620n-soc";
-	model = "ZyXEL Keenetic Lite III (rev. A)";
+	model = "Zyxel Keenetic Lite III (rev. A)";
 
 	aliases {
 		led-boot = &led_wan;

target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,keenetic-omni-ii", "ralink,mt7620n-soc";
-	model = "ZyXEL Keenetic Omni II";
+	model = "Zyxel Keenetic Omni II";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,keenetic-omni", "ralink,mt7620n-soc";
-	model = "ZyXEL Keenetic Omni";
+	model = "Zyxel Keenetic Omni";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts

@@ -7,7 +7,7 @@
 
 / {
 	compatible = "zyxel,lte3301-plus", "mediatek,mt7621-soc";
-	model = "ZyXEL LTE3301-Plus";
+	model = "Zyxel LTE3301-Plus";
 
 	aliases {
 		label-mac-device = &gmac0;

target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts

@@ -8,7 +8,7 @@
 
 / {
 	compatible = "zyxel,lte5398-m904", "mediatek,mt7621-soc";
-	model = "ZyXEL LTE5398-M904";
+	model = "Zyxel LTE5398-M904";
 
 	aliases {
 		label-mac-device = &gmac0;

target/linux/ramips/dts/mt7621_zyxel_nr7101.dts

@@ -7,7 +7,7 @@
 
 / {
 	compatible = "zyxel,nr7101", "mediatek,mt7621-soc";
-	model = "ZyXEL NR7101";
+	model = "Zyxel NR7101";
 
 	aliases {
 		led-boot = &led_system_green;

target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts

@@ -5,7 +5,7 @@
 
 / {
 	compatible = "zyxel,nwa50ax", "mediatek,mt7621-soc";
-	model = "ZyXEL NWA50AX";
+	model = "Zyxel NWA50AX";
 
 	aliases {
 		led-boot = &led_system_green;

target/linux/ramips/dts/mt7621_zyxel_nwa55axe.dts

@@ -2,5 +2,5 @@
 
 / {
 	compatible = "zyxel,nwa55axe", "mediatek,mt7621-soc";
-	model = "ZyXEL NWA55AXE";
+	model = "Zyxel NWA55AXE";
 };

target/linux/ramips/dts/mt7621_zyxel_wap6805.dts

@@ -8,7 +8,7 @@
 
 / {
 	compatible = "zyxel,wap6805", "mediatek,mt7621-soc";
-	model = "ZyXEL WAP6805";
+	model = "Zyxel WAP6805";
 
 	aliases {
 		led-boot = &led_status_green;

target/linux/ramips/dts/mt7621_zyxel_wsm20.dts

@@ -7,7 +7,7 @@
 
 / {
 	compatible = "zyxel,wsm20", "mediatek,mt7621-soc";
-	model = "ZyXEL WSM20";
+	model = "Zyxel WSM20";
 
 	aliases {
 		led-boot = &led_system_white;

target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,keenetic-extra-ii", "mediatek,mt7628an-soc";
-	model = "ZyXEL Keenetic Extra II";
+	model = "Zyxel Keenetic Extra II";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/rt3052_zyxel_keenetic.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,keenetic", "ralink,rt3052-soc";
-	model = "ZyXEL Keenetic";
+	model = "Zyxel Keenetic";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,nbg-419n", "ralink,rt3052-soc";
-	model = "ZyXEL NBG-419N";
+	model = "Zyxel NBG-419N";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts

@@ -6,7 +6,7 @@
 
 / {
 	compatible = "zyxel,nbg-419n-v2", "ralink,rt3352-soc";
-	model = "ZyXEL NBG-419N v2";
+	model = "Zyxel NBG-419N v2";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/rt5350_zyxel_keenetic-4g-b.dts

@@ -8,7 +8,7 @@
 
 / {
 	compatible = "zyxel,keenetic-4g-b", "ralink,rt5350-soc";
-	model = "ZyXEL Keenetic 4G Rev.B";
+	model = "Zyxel Keenetic 4G Rev.B";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts

@@ -8,7 +8,7 @@
 
 / {
 	compatible = "zyxel,keenetic-lite-b", "ralink,rt5350-soc";
-	model = "ZyXEL Keenetic Lite Rev.B";
+	model = "Zyxel Keenetic Lite Rev.B";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts

@@ -8,7 +8,7 @@
 
 / {
 	compatible = "zyxel,keenetic-start", "ralink,rt5350-soc";
-	model = "ZyXEL Keenetic Start";
+	model = "Zyxel Keenetic Start";
 
 	aliases {
 		led-boot = &led_power;

target/linux/ramips/image/mt7620.mk

@@ -1574,7 +1574,7 @@ TARGET_DEVICES += zte_q7
 define Device/zyxel_keenetic-lite-iii-a
   SOC := mt7620n
   IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic Lite III
   DEVICE_VARIANT := A
   IMAGES += factory.bin
@@ -1586,7 +1586,7 @@ TARGET_DEVICES += zyxel_keenetic-lite-iii-a
 define Device/zyxel_keenetic-omni
   SOC := mt7620n
   IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic Omni
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
@@ -1599,7 +1599,7 @@ TARGET_DEVICES += zyxel_keenetic-omni
 define Device/zyxel_keenetic-omni-ii
   SOC := mt7620n
   IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic Omni II
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
@@ -1612,7 +1612,7 @@ TARGET_DEVICES += zyxel_keenetic-omni-ii
 define Device/zyxel_keenetic-viva
   SOC := mt7620a
   IMAGE_SIZE := 16064k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic Viva
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
 	kmod-switch-rtl8367b

target/linux/ramips/image/mt7621.mk

@@ -3262,7 +3262,7 @@ TARGET_DEVICES += zio_freezio
 
 define Device/zyxel_lte3301-plus
   $(Device/nand)
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := LTE3301-PLUS
   KERNEL_SIZE := 31488k
   DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport \
@@ -3277,7 +3277,7 @@ TARGET_DEVICES += zyxel_lte3301-plus
 
 define Device/zyxel_lte5398-m904
   $(Device/nand)
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := LTE5398-M904
   KERNEL_SIZE := 31488k
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615-firmware kmod-usb3 uqmi \
@@ -3292,7 +3292,7 @@ TARGET_DEVICES += zyxel_lte5398-m904
 
 define Device/zyxel_nr7101
   $(Device/nand)
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NR7101
   KERNEL_SIZE := 31488k
   DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi
@@ -3304,7 +3304,7 @@ TARGET_DEVICES += zyxel_nr7101
 
 define Device/zyxel_nwa-ax
   $(Device/nand)
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   KERNEL_SIZE := 8192k
   DEVICE_PACKAGES := kmod-mt7915-firmware zyxel-bootconfig
   KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
@@ -3329,7 +3329,7 @@ define Device/zyxel_wap6805
   $(Device/nand)
   $(Device/uimage-lzma-loader)
   IMAGE_SIZE := 32448k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := WAP6805
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt7621-qtn-rgmii -uboot-envtools
   KERNEL := $$(KERNEL/lzma-loader) | uImage none | uimage-padhdr 160
@@ -3340,7 +3340,7 @@ define Device/zyxel_wsm20
   $(Device/nand)
   KERNEL_SIZE := 8192k
   IMAGE_SIZE := 41943040
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := WSM20
   DEVICE_PACKAGES := kmod-mt7915-firmware
   KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | znet-header V1.00(ABZF.0)C0

target/linux/ramips/image/mt76x8.mk

@@ -1152,7 +1152,7 @@ TARGET_DEVICES += zbtlink_zbt-we1226
 
 define Device/zyxel_keenetic-extra-ii
   IMAGE_SIZE := 29824k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic Extra II
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \
 	kmod-usb-ledtrig-usbport

target/linux/ramips/image/rt305x.mk

@@ -1220,7 +1220,7 @@ TARGET_DEVICES += zte_mf283plus
 define Device/zyxel_keenetic
   SOC := rt3052
   IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport \
 	kmod-usb-dwc2
@@ -1233,7 +1233,7 @@ define Device/zyxel_keenetic-4g-b
   $(Device/uimage-lzma-loader)
   SOC := rt5350
   IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic 4G
   DEVICE_VARIANT := B
   DEFAULT := n
@@ -1244,7 +1244,7 @@ define Device/zyxel_keenetic-lite-b
   $(Device/uimage-lzma-loader)
   SOC := rt5350
   IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic Lite
   DEVICE_VARIANT := B
   DEFAULT := n
@@ -1254,7 +1254,7 @@ TARGET_DEVICES += zyxel_keenetic-lite-b
 define Device/zyxel_keenetic-start
   SOC := rt5350
   IMAGE_SIZE := 3776k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := Keenetic Start
   DEFAULT := n
 endef
@@ -1263,7 +1263,7 @@ TARGET_DEVICES += zyxel_keenetic-start
 define Device/zyxel_nbg-419n
   SOC := rt3052
   IMAGE_SIZE := 3776k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NBG-419N
   SUPPORTED_DEVICES += nbg-419n
   DEFAULT := n
@@ -1274,7 +1274,7 @@ define Device/zyxel_nbg-419n-v2
   $(Device/uimage-lzma-loader)
   SOC := rt3352
   IMAGE_SIZE := 7872k
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   DEVICE_MODEL := NBG-419N
   DEVICE_VARIANT := v2
   SUPPORTED_DEVICES += nbg-419n2

target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-10hp.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-10hp", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-10HP Switch";
+	model = "Zyxel GS1900-10HP Switch";
 
 	/* i2c of the left SFP cage: port 9 */
 	i2c0: i2c-gpio-0 {

target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-8", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-8v1/v2 Switch";
+	model = "Zyxel GS1900-8v1/v2 Switch";
 };
 
 &gpio1 {

target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v1.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-8hp-v1", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-8HP v1 Switch";
+	model = "Zyxel GS1900-8HP v1 Switch";
 };
 
 &uart1 {

target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v2.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-8hp-v2", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-8HP v2 Switch";
+	model = "Zyxel GS1900-8HP v2 Switch";
 };
 
 &uart1 {

target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-16.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-16", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-16";
+	model = "Zyxel GS1900-16";
 };
 
 &mdio {

target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24-v1.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-24-v1", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-24 v1";
+	model = "Zyxel GS1900-24 v1";
 
 	memory@0 {
 		reg = <0x0 0x4000000>;

target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24e.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-24e", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-24E";
+	model = "Zyxel GS1900-24E";
 };
 
 &mdio {

target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24ep.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-24ep", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-24EP Switch";
+	model = "Zyxel GS1900-24EP Switch";
 };
 
 &uart1 {

target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v1.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-24hp-v1", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-24HP v1";
+	model = "Zyxel GS1900-24HP v1";
 
 	memory@0 {
 		reg = <0x0 0x4000000>;

target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v2.dts

@@ -4,7 +4,7 @@
 
 / {
 	compatible = "zyxel,gs1900-24hp-v2", "realtek,rtl838x-soc";
-	model = "ZyXEL GS1900-24HP v2 Switch";
+	model = "Zyxel GS1900-24HP v2 Switch";
 
 	/* i2c of the left SFP cage: port 25 */
 	i2c0: i2c-gpio-0 {

target/linux/realtek/image/common.mk

@@ -57,7 +57,7 @@ define Device/hpe_1920
 endef
 
 define Device/zyxel_gs1900
-  DEVICE_VENDOR := ZyXEL
+  DEVICE_VENDOR := Zyxel
   IMAGE_SIZE := 6976k
   UIMAGE_MAGIC := 0x83800000
   KERNEL_INITRAMFS := \

target/linux/realtek/image/rtl838x.mk

@@ -314,7 +314,7 @@ define Device/zyxel_gs1900-8
   SOC := rtl8380
   DEVICE_MODEL := GS1900-8
   DEVICE_VARIANT := v1
-  DEVICE_ALT0_VENDOR := ZyXEL
+  DEVICE_ALT0_VENDOR := Zyxel
   DEVICE_ALT0_MODEL := GS1900-8
   DEVICE_ALT0_VARIANT := v2
   ZYXEL_VERS := AAHH