From 002fdd378185aac92526ba86557620021aecc84d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 15 Aug 2024 12:57:51 -0700 Subject: [PATCH 01/23] lantiq: vgv7510kw22: use NVMEM for mac addresses Userspace handling is deprecated. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16230 Signed-off-by: Robert Marko --- .../arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi | 3 +++ target/linux/lantiq/xrx200/base-files/etc/board.d/02_network | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi index daf115088b..5ef6a4cc9e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi @@ -169,6 +169,9 @@ label = "wan"; phy-mode = "mii"; phy-handle = <&phy1>; + + nvmem-cells = <&macaddr_boardconfig_16 2>; + nvmem-cell-names = "mac-address"; }; port@2 { reg = <2>; diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network index 2208752c14..27a3c75edc 100644 --- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network @@ -110,10 +110,6 @@ lantiq_setup_macs() lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) wan_mac=$(macaddr_add "$lan_mac" 1) ;; - arcadyan,vgv7510kw22-brn|\ - arcadyan,vgv7510kw22-nor) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) - ;; arcadyan,vgv7519-brn|\ arcadyan,vgv7519-nor|\ arcadyan,vrv9510kwac23) From b35bb0917502aa189be689b572548b038fdfd7c7 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sun, 11 Aug 2024 21:53:24 +0200 Subject: [PATCH 02/23] ath79: remove 5GHz wifi bits from Sophos AP15 Sophos AP15 only uses the SoC's built-in wifi. There's no external PCIe chipset. Signed-off-by: Martin Blumenstingl Link: https://github.com/openwrt/openwrt/pull/16187 Signed-off-by: Hauke Mehrtens --- target/linux/ath79/dts/qca9558_sophos_ap15.dts | 15 --------------- target/linux/ath79/image/generic.mk | 1 - 2 files changed, 16 deletions(-) diff --git a/target/linux/ath79/dts/qca9558_sophos_ap15.dts b/target/linux/ath79/dts/qca9558_sophos_ap15.dts index 7949d3e88f..de54948c87 100644 --- a/target/linux/ath79/dts/qca9558_sophos_ap15.dts +++ b/target/linux/ath79/dts/qca9558_sophos_ap15.dts @@ -40,17 +40,6 @@ }; }; -&pcie0 { - status = "okay"; - - wifi@0,0 { - compatible = "qcom,ath10k"; - reg = <0x0000 0 0 0 0>; - nvmem-cells = <&cal_art_5000>; - nvmem-cell-names = "calibration"; - }; -}; - &spi { status = "okay"; @@ -88,10 +77,6 @@ cal_art_1000: calibration@1000 { reg = <0x1000 0x440>; }; - - cal_art_5000: calibration@5000 { - reg = <0x5000 0x844>; - }; }; }; diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 00aa688156..8bfa359910 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -2916,7 +2916,6 @@ define Device/sophos_ap15 SOC := qca9558 DEVICE_VENDOR := Sophos DEVICE_MODEL := AP15 - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15936k endef TARGET_DEVICES += sophos_ap15 From fc31261c3307458e38c9a676211a25c99c044ece Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sun, 11 Aug 2024 21:55:16 +0200 Subject: [PATCH 03/23] ath79: update Sophos AP15 to indicate that it uses an QCA9557 SoC Device support for Sophos AP15 is based on Sophos AP55(C) and AP100(C). Those other Sophos access points uss a QCA9558 SoC (some of them with one of the three chains on the built-in SoC's wifi disabled) while the AP15 uses a QCA9557 SoC (which only has two chains enabled in the package or silicon). This is mostly cosmetic since QCA9558 and QCA9557 are virtually identical and all differences are automatically detected and/or managed by the ART calibration. Signed-off-by: Martin Blumenstingl Link: https://github.com/openwrt/openwrt/pull/16187 Signed-off-by: Hauke Mehrtens --- .../dts/{qca9558_sophos_ap15.dts => qca9557_sophos_ap15.dts} | 2 +- target/linux/ath79/image/generic.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename target/linux/ath79/dts/{qca9558_sophos_ap15.dts => qca9557_sophos_ap15.dts} (98%) diff --git a/target/linux/ath79/dts/qca9558_sophos_ap15.dts b/target/linux/ath79/dts/qca9557_sophos_ap15.dts similarity index 98% rename from target/linux/ath79/dts/qca9558_sophos_ap15.dts rename to target/linux/ath79/dts/qca9557_sophos_ap15.dts index de54948c87..773b423cde 100644 --- a/target/linux/ath79/dts/qca9558_sophos_ap15.dts +++ b/target/linux/ath79/dts/qca9557_sophos_ap15.dts @@ -7,7 +7,7 @@ #include / { - compatible = "sophos,ap15", "qca,qca9558"; + compatible = "sophos,ap15", "qca,qca9557"; model = "Sophos AP15"; aliases { diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 8bfa359910..98968241e9 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -2913,7 +2913,7 @@ endef TARGET_DEVICES += sitecom_wlr-8100 define Device/sophos_ap15 - SOC := qca9558 + SOC := qca9557 DEVICE_VENDOR := Sophos DEVICE_MODEL := AP15 IMAGE_SIZE := 15936k From b6ac37110f19d130f608707b0bfcf8c1df60fbdf Mon Sep 17 00:00:00 2001 From: Johannes Truschnigg Date: Sun, 4 Aug 2024 21:21:13 +0200 Subject: [PATCH 04/23] linux-firmware: add Intel CPU-integrated GPU (iGPU) firmware On latest Intel x86 CPUs, DMC firmware is required for the iGPU to reach its lowest power states. If the driver cannot load it, it will print a warning and unnecessarily make the iGPU draw a bit more power when idle. GUC firmware (various "offload" mechanisms that deal with scheduling GPU workloads) and HUC firmware (required for accelerated media codec operations for HEVC/H.265) are probably more niche, but could also provde useful for some - for example, when building an Intel/OpenWrt-based security camera. Signed-off-by: Johannes Truschnigg Link: https://github.com/openwrt/openwrt/pull/16069 Signed-off-by: Hauke Mehrtens --- package/firmware/linux-firmware/intel.mk | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk index f6acb45d48..b686a4caf8 100644 --- a/package/firmware/linux-firmware/intel.mk +++ b/package/firmware/linux-firmware/intel.mk @@ -215,3 +215,30 @@ define Package/e100-firmware/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d102e_ucode.bin $(1)/lib/firmware/e100/ endef $(eval $(call BuildPackage,e100-firmware)) + +Package/intel-igpu-firmware-dmc = $(call Package/firmware-default,Intel iGPU DMC Display MC firmware) +define Package/intel-igpu-firmware-dmc/install + $(INSTALL_DIR) $(1)/lib/firmware/i915 + $(CP) \ + $(PKG_BUILD_DIR)/i915/*_dmc_*.bin* \ + $(1)/lib/firmware/i915/ +endef +$(eval $(call BuildPackage,intel-igpu-firmware-dmc)) + +Package/intel-igpu-firmware-guc = $(call Package/firmware-default,Intel iGPU GUC Graphics MC firmware) +define Package/intel-igpu-firmware-guc/install + $(INSTALL_DIR) $(1)/lib/firmware/i915 + $(CP) \ + $(PKG_BUILD_DIR)/i915/*_guc_*.bin* \ + $(1)/lib/firmware/i915/ +endef +$(eval $(call BuildPackage,intel-igpu-firmware-guc)) + +Package/intel-igpu-firmware-huc = $(call Package/firmware-default,Intel iGPU HUC H.265 MC firmware) +define Package/intel-igpu-firmware-huc/install + $(INSTALL_DIR) $(1)/lib/firmware/i915 + $(CP) \ + $(PKG_BUILD_DIR)/i915/*_huc_*.bin* \ + $(1)/lib/firmware/i915/ +endef +$(eval $(call BuildPackage,intel-igpu-firmware-huc)) From da502be941a7ee50cd7da0c8654b7c836ce63ab2 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Fri, 23 Aug 2024 16:48:53 +0200 Subject: [PATCH 05/23] mt76: Add firmware files into mt7925-firmware package The firmware binaries were missing in kmod-mt7925-firmware package. Signed-off-by: Daniel Pawlik Link: https://github.com/openwrt/openwrt/pull/16239 Signed-off-by: Hauke Mehrtens --- package/kernel/mt76/Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 2501f37d30..27a52275d8 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -329,6 +329,12 @@ define KernelPackage/mt7996-firmware DEPENDS+=+kmod-mt7996e endef +define KernelPackage/mt7925-firmware + $(KernelPackage/mt76-default) + TITLE:=MediaTek MT7925 firmware + DEPENDS+=+kmod-mt7925e +endef + define KernelPackage/mt7925-common $(KernelPackage/mt76-default) TITLE:=MediaTek MT7925 wireless driver common code @@ -616,6 +622,14 @@ define KernelPackage/mt7922-firmware/install $(1)/lib/firmware/mediatek endef +define KernelPackage/mt7925-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7925 + cp \ + $(PKG_BUILD_DIR)/firmware/mt7925/WIFI_MT7925_PATCH_MCU_1_1_hdr.bin \ + $(PKG_BUILD_DIR)/firmware/mt7925/WIFI_RAM_CODE_MT7925_1_1.bin \ + $(1)/lib/firmware/mediatek/mt7925 +endef + define KernelPackage/mt7996-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7996 cp \ @@ -666,6 +680,7 @@ $(eval $(call KernelPackage,mt7981-firmware)) $(eval $(call KernelPackage,mt7986-firmware)) $(eval $(call KernelPackage,mt7921-firmware)) $(eval $(call KernelPackage,mt7922-firmware)) +$(eval $(call KernelPackage,mt7925-firmware)) $(eval $(call KernelPackage,mt792x-common)) $(eval $(call KernelPackage,mt792x-usb)) $(eval $(call KernelPackage,mt7921-common)) From 9482341a475245cc38244cf5fbe06ca30432315f Mon Sep 17 00:00:00 2001 From: xiaobo tian Date: Wed, 21 Aug 2024 14:40:27 +0800 Subject: [PATCH 06/23] rockchip: add support for nanopc t6 SoC: Rockchip RK3588 CPU: Quad-core ARM Cortex-A76(up to 2.4GHz) and quad-core Cortex-A55 CPU (up to 1.8GHz) GPU: Mali-G610 MP4, compatible with OpenGLES 1.1, 2.0, and 3.2, OpenCL up to 2.2 and Vulkan1.2 VPU: 8K@60fps H.265 and VP9 decoder, 8K@30fps H.264 decoder, 4K@60fps AV1 decoder, 8K@30fps H.264 and H.265 encoder NPU: 6TOPs, supports INT4/INT8/INT16/FP16 RAM: 64-bit 4GB/8GB/16GB LPDDR4X at 2133MHz Flash: 32GB/64GB/256GB eMMC, at HS400 mode microSD: support up to SDR104 mode Ethernet: 2x PCIe 2.5G Ethernet Signed-off-by: xiaobo tian Link: https://github.com/openwrt/openwrt/pull/16158 Signed-off-by: Hauke Mehrtens --- package/boot/uboot-rockchip/Makefile | 8 +++++++ .../armv8/base-files/etc/board.d/02_network | 10 +++++---- .../etc/hotplug.d/net/40-net-smp-affinity | 13 ++++++----- target/linux/rockchip/image/armv8.mk | 8 +++++++ ...ses-and-stop-heartbeat-for-nanopc-t6.patch | 22 +++++++++++++++++++ ...ckchip-lower-mmc-speed-for-nanopc-t6.patch | 11 ++++++++++ 6 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 target/linux/rockchip/patches-6.6/120-arm64-dts-rockchip-add-led-aliases-and-stop-heartbeat-for-nanopc-t6.patch create mode 100644 target/linux/rockchip/patches-6.6/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index b2d5a6cc79..79c3b71148 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -230,6 +230,13 @@ define U-Boot/rock5b-rk3588 radxa_rock-5b endef +define U-Boot/nanopc-t6-rk3588 + $(U-Boot/rk3588/Default) + NAME:=NanoPC T6 + BUILD_DEVICES:= \ + friendlyarm_nanopc-t6 +endef + # RK3588S boards @@ -269,6 +276,7 @@ UBOOT_TARGETS := \ radxa-e25-rk3568 \ rock-3a-rk3568 \ rock5b-rk3588 \ + nanopc-t6-rk3588 \ nanopi-r6s-rk3588s \ rock5a-rk3588s diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network index 506ef67245..0e3bb8deaf 100644 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -7,6 +7,11 @@ rockchip_setup_interfaces() local board="$1" case "$board" in + friendlyarm,nanopc-t6|\ + friendlyarm,nanopi-r5c|\ + radxa,e25) + ucidef_set_interfaces_lan_wan 'eth0' 'eth1' + ;; friendlyarm,nanopi-r2c|\ friendlyarm,nanopi-r2c-plus|\ friendlyarm,nanopi-r2s|\ @@ -17,10 +22,6 @@ rockchip_setup_interfaces() xunlong,orangepi-r1-plus-lts) ucidef_set_interfaces_lan_wan 'eth1' 'eth0' ;; - friendlyarm,nanopi-r5c|\ - radxa,e25) - ucidef_set_interfaces_lan_wan 'eth0' 'eth1' - ;; friendlyarm,nanopi-r5s) ucidef_set_interfaces_lan_wan 'eth1 eth2' 'eth0' ;; @@ -44,6 +45,7 @@ rockchip_setup_macs() local label_mac="" case "$board" in + friendlyarm,nanopc-t6|\ friendlyarm,nanopi-r2c|\ friendlyarm,nanopi-r2s) wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0) diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity index 5716aaf496..db1bb2ba65 100644 --- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity +++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity @@ -29,6 +29,13 @@ set_interface_core() { } case "$(board_name)" in +friendlyarm,nanopc-t6|\ +friendlyarm,nanopi-r5c|\ +radxa,e25|\ +sinovoip,rk3568-bpi-r2pro) + set_interface_core 2 "eth0" + set_interface_core 4 "eth1" + ;; friendlyarm,nanopi-r2c|\ friendlyarm,nanopi-r2c-plus|\ friendlyarm,nanopi-r2s|\ @@ -43,12 +50,6 @@ friendlyarm,nanopi-r4s-enterprise) set_interface_core 10 "eth0" set_interface_core 20 "eth1" ;; -friendlyarm,nanopi-r5c|\ -radxa,e25|\ -sinovoip,rk3568-bpi-r2pro) - set_interface_core 2 "eth0" - set_interface_core 4 "eth1" - ;; friendlyarm,nanopi-r5s|\ friendlyarm,nanopi-r6s) set_interface_core 2 "eth0" diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 5f62ae0dc5..e7e33079fb 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -22,6 +22,14 @@ define Device/friendlyarm_nanopc-t4 endef TARGET_DEVICES += friendlyarm_nanopc-t4 +define Device/friendlyarm_nanopc-t6 + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPC T6 + SOC := rk3588 + DEVICE_PACKAGES := kmod-r8169 +endef +TARGET_DEVICES += friendlyarm_nanopc-t6 + define Device/friendlyarm_nanopi-r2c DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R2C diff --git a/target/linux/rockchip/patches-6.6/120-arm64-dts-rockchip-add-led-aliases-and-stop-heartbeat-for-nanopc-t6.patch b/target/linux/rockchip/patches-6.6/120-arm64-dts-rockchip-add-led-aliases-and-stop-heartbeat-for-nanopc-t6.patch new file mode 100644 index 0000000000..bef4b0fdbb --- /dev/null +++ b/target/linux/rockchip/patches-6.6/120-arm64-dts-rockchip-add-led-aliases-and-stop-heartbeat-for-nanopc-t6.patch @@ -0,0 +1,22 @@ +--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +@@ -19,6 +19,10 @@ + aliases { + mmc0 = &sdhci; + mmc1 = &sdmmc; ++ led-boot = &sys_led; ++ led-failsafe = &sys_led; ++ led-running = &sys_led; ++ led-upgrade = &sys_led; + }; + + chosen { +@@ -31,7 +35,7 @@ + sys_led: led-0 { + gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + label = "system-led"; +- linux,default-trigger = "heartbeat"; ++ default-state = "on"; + pinctrl-names = "default"; + pinctrl-0 = <&sys_led_pin>; + }; diff --git a/target/linux/rockchip/patches-6.6/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch b/target/linux/rockchip/patches-6.6/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch new file mode 100644 index 0000000000..c73b807f33 --- /dev/null +++ b/target/linux/rockchip/patches-6.6/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch @@ -0,0 +1,11 @@ +--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +@@ -547,7 +547,7 @@ + cap-mmc-highspeed; + cap-sd-highspeed; + disable-wp; +- sd-uhs-sdr104; ++ sd-uhs-sdr50; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vccio_sd_s0>; + status = "okay"; From 0db32940a2010a2a6fbecbf6f9fe7dc8cb190e57 Mon Sep 17 00:00:00 2001 From: FUKAUMI Naoki Date: Thu, 22 Aug 2024 10:38:59 +0900 Subject: [PATCH 07/23] rockchip: fix compatible string for Radxa ROCK 5A revert unwanted change for compatible string. Signed-off-by: FUKAUMI Naoki Link: https://github.com/openwrt/openwrt/pull/16221 Signed-off-by: Hauke Mehrtens --- ...-dts-rockchip-Update-LED-properties-for-Radxa-Ro.patch | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/target/linux/rockchip/patches-6.6/116-arm64-dts-rockchip-Update-LED-properties-for-Radxa-Ro.patch b/target/linux/rockchip/patches-6.6/116-arm64-dts-rockchip-Update-LED-properties-for-Radxa-Ro.patch index 7a5ebb8775..c09915b0e8 100644 --- a/target/linux/rockchip/patches-6.6/116-arm64-dts-rockchip-Update-LED-properties-for-Radxa-Ro.patch +++ b/target/linux/rockchip/patches-6.6/116-arm64-dts-rockchip-Update-LED-properties-for-Radxa-Ro.patch @@ -11,13 +11,7 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -9,11 +9,16 @@ - - / { - model = "Radxa ROCK 5A"; -- compatible = "radxa,rock-5a", "rockchip,rk3588s"; -+ compatible = "radxa,rock-5a", "rockchip,rk3588"; - +@@ -14,6 +14,11 @@ aliases { mmc0 = &sdhci; mmc1 = &sdmmc; From b68e34c83771167f25d301adf5fb4de57bb2eab2 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Thu, 22 Aug 2024 21:00:40 +0200 Subject: [PATCH 08/23] mt76: Change AutoLoad macro call for mt7925e and mt7925u There was a typo done for mt7925e and mt7925u in the KernelPackage definitions, which caused the system to load the wrong kernel modules. Signed-off-by: Daniel Pawlik Link: https://github.com/openwrt/openwrt/pull/16236 Signed-off-by: Hauke Mehrtens --- package/kernel/mt76/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 27a52275d8..5e5c378953 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -348,7 +348,7 @@ define KernelPackage/mt7925u TITLE:=MediaTek MT7925U wireless driver DEPENDS+=+kmod-mt792x-usb +kmod-mt7925-common FILES:= $(PKG_BUILD_DIR)/mt7925/mt7925u.ko - AUTOLOAD:=$(call AutoProbe,mt7921u) + AUTOLOAD:=$(call AutoProbe,mt7925u) endef define KernelPackage/mt7925e @@ -356,7 +356,7 @@ define KernelPackage/mt7925e TITLE:=MediaTek MT7925e wireless driver DEPENDS+=@PCI_SUPPORT +kmod-mt7925-common FILES:= $(PKG_BUILD_DIR)/mt7925/mt7925e.ko - AUTOLOAD:=$(call AutoProbe,mt7921e) + AUTOLOAD:=$(call AutoProbe,mt7925e) endef define Package/mt76-test From ae5489e57894cbd07e2cadf28d6a47bf7c36ab55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sat, 24 Aug 2024 15:05:30 +0200 Subject: [PATCH 09/23] generic: 6.6: backport upstream Realtek PHY patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix setting of PHY LEDs Mode B bit on RTL8211F. - Rename pending Realtek PHY patches. Signed-off-by: Álvaro Fernández Rojas --- ...Fix-setting-of-PHY-LEDs-Mode-B-bit-o.patch | 42 +++++++++++++++++++ ...use-genphy_soft_reset-for-2.5G-PHYs.patch} | 16 +++---- ...able-SGMII-in-band-AN-for-2-5G-PHYs.patch} | 4 +- ...ake-sure-paged-read-is-protected-by.patch} | 2 +- ...se-inline-functions-for-10GbE-adver.patch} | 2 +- ...heck-validity-of-10GbE-link-partner.patch} | 2 +- ...phy-realtek-introduce-rtl822x_probe.patch} | 14 +++---- ...ek-detect-early-version-of-RTL8221B.patch} | 2 +- ...altek-support-interrupt-of-RTL8221B.patch} | 10 ++--- 9 files changed, 68 insertions(+), 26 deletions(-) create mode 100644 target/linux/generic/backport-6.6/781-12-v6.11-net-phy-realtek-Fix-setting-of-PHY-LEDs-Mode-B-bit-o.patch rename target/linux/generic/pending-6.6/{724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch => 720-01-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch} (85%) rename target/linux/generic/pending-6.6/{725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch => 720-02-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch} (93%) rename target/linux/generic/pending-6.6/{726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch => 720-03-net-phy-realtek-make-sure-paged-read-is-protected-by.patch} (95%) rename target/linux/generic/pending-6.6/{727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch => 720-04-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch} (93%) rename target/linux/generic/pending-6.6/{728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch => 720-05-net-phy-realtek-check-validity-of-10GbE-link-partner.patch} (93%) rename target/linux/generic/pending-6.6/{729-net-phy-realtek-introduce-rtl822x_probe.patch => 720-06-net-phy-realtek-introduce-rtl822x_probe.patch} (87%) rename target/linux/generic/pending-6.6/{730-net-phy-realtek-detect-early-version-of-RTL8221B.patch => 720-07-net-phy-realtek-detect-early-version-of-RTL8221B.patch} (95%) rename target/linux/generic/pending-6.6/{741-net-phy-realtek-support-interrupt-of-RTL8221B.patch => 720-08-net-phy-realtek-support-interrupt-of-RTL8221B.patch} (89%) diff --git a/target/linux/generic/backport-6.6/781-12-v6.11-net-phy-realtek-Fix-setting-of-PHY-LEDs-Mode-B-bit-o.patch b/target/linux/generic/backport-6.6/781-12-v6.11-net-phy-realtek-Fix-setting-of-PHY-LEDs-Mode-B-bit-o.patch new file mode 100644 index 0000000000..5958fc929c --- /dev/null +++ b/target/linux/generic/backport-6.6/781-12-v6.11-net-phy-realtek-Fix-setting-of-PHY-LEDs-Mode-B-bit-o.patch @@ -0,0 +1,42 @@ +From a2f5c505b4378cd6fc7c4a44ff3665ccef2037db Mon Sep 17 00:00:00 2001 +From: Sava Jakovljev +Date: Wed, 21 Aug 2024 04:16:57 +0200 +Subject: [PATCH] net: phy: realtek: Fix setting of PHY LEDs Mode B bit on + RTL8211F + +The current implementation incorrectly sets the mode bit of the PHY chip. +Bit 15 (RTL8211F_LEDCR_MODE) should not be shifted together with the +configuration nibble of a LED- it should be set independently of the +index of the LED being configured. +As a consequence, the RTL8211F LED control is actually operating in Mode A. +Fix the error by or-ing final register value to write with a const-value of +RTL8211F_LEDCR_MODE, thus setting Mode bit explicitly. + +Fixes: 17784801d888 ("net: phy: realtek: Add support for PHY LEDs on RTL8211F") +Signed-off-by: Sava Jakovljev +Reviewed-by: Marek Vasut +Link: https://patch.msgid.link/PAWP192MB21287372F30C4E55B6DF6158C38E2@PAWP192MB2128.EURP192.PROD.OUTLOOK.COM +Signed-off-by: Paolo Abeni +--- + drivers/net/phy/realtek.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/phy/realtek.c ++++ b/drivers/net/phy/realtek.c +@@ -555,7 +555,7 @@ static int rtl8211f_led_hw_control_set(s + unsigned long rules) + { + const u16 mask = RTL8211F_LEDCR_MASK << (RTL8211F_LEDCR_SHIFT * index); +- u16 reg = RTL8211F_LEDCR_MODE; /* Mode B */ ++ u16 reg = 0; + + if (index >= RTL8211F_LED_COUNT) + return -EINVAL; +@@ -575,6 +575,7 @@ static int rtl8211f_led_hw_control_set(s + } + + reg <<= RTL8211F_LEDCR_SHIFT * index; ++ reg |= RTL8211F_LEDCR_MODE; /* Mode B */ + + return phy_modify_paged(phydev, 0xd04, RTL8211F_LEDCR, mask, reg); + } diff --git a/target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch b/target/linux/generic/pending-6.6/720-01-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch similarity index 85% rename from target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch rename to target/linux/generic/pending-6.6/720-01-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch index 51cf9580f1..fe8ee7b5fa 100644 --- a/target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch +++ b/target/linux/generic/pending-6.6/720-01-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1324,6 +1324,7 @@ static struct phy_driver realtek_drvs[] +@@ -1325,6 +1325,7 @@ static struct phy_driver realtek_drvs[] }, { .name = "RTL8226 2.5Gbps PHY", .match_phy_device = rtl8226_match_phy_device, @@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, .read_status = rtl822x_read_status, -@@ -1336,6 +1337,7 @@ static struct phy_driver realtek_drvs[] +@@ -1337,6 +1338,7 @@ static struct phy_driver realtek_drvs[] }, { PHY_ID_MATCH_EXACT(0x001cc840), .name = "RTL8226B_RTL8221B 2.5Gbps PHY", @@ -31,7 +31,7 @@ Signed-off-by: Daniel Golle .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, .config_init = rtl822xb_config_init, -@@ -1350,6 +1352,7 @@ static struct phy_driver realtek_drvs[] +@@ -1351,6 +1353,7 @@ static struct phy_driver realtek_drvs[] }, { PHY_ID_MATCH_EXACT(0x001cc838), .name = "RTL8226-CG 2.5Gbps PHY", @@ -39,7 +39,7 @@ Signed-off-by: Daniel Golle .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, .read_status = rtl822x_read_status, -@@ -1360,6 +1363,7 @@ static struct phy_driver realtek_drvs[] +@@ -1361,6 +1364,7 @@ static struct phy_driver realtek_drvs[] }, { PHY_ID_MATCH_EXACT(0x001cc848), .name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY", @@ -47,7 +47,7 @@ Signed-off-by: Daniel Golle .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, .config_init = rtl822xb_config_init, -@@ -1372,6 +1376,7 @@ static struct phy_driver realtek_drvs[] +@@ -1373,6 +1377,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vb_cg_c22_match_phy_device, .name = "RTL8221B-VB-CG 2.5Gbps PHY (C22)", @@ -55,7 +55,7 @@ Signed-off-by: Daniel Golle .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, .config_init = rtl822xb_config_init, -@@ -1384,6 +1389,7 @@ static struct phy_driver realtek_drvs[] +@@ -1385,6 +1390,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vb_cg_c45_match_phy_device, .name = "RTL8221B-VB-CG 2.5Gbps PHY (C45)", @@ -63,7 +63,7 @@ Signed-off-by: Daniel Golle .config_init = rtl822xb_config_init, .get_rate_matching = rtl822xb_get_rate_matching, .get_features = rtl822x_c45_get_features, -@@ -1394,6 +1400,7 @@ static struct phy_driver realtek_drvs[] +@@ -1395,6 +1401,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vn_cg_c22_match_phy_device, .name = "RTL8221B-VM-CG 2.5Gbps PHY (C22)", @@ -71,7 +71,7 @@ Signed-off-by: Daniel Golle .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, .config_init = rtl822xb_config_init, -@@ -1406,6 +1413,7 @@ static struct phy_driver realtek_drvs[] +@@ -1407,6 +1414,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vn_cg_c45_match_phy_device, .name = "RTL8221B-VN-CG 2.5Gbps PHY (C45)", diff --git a/target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch b/target/linux/generic/pending-6.6/720-02-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch similarity index 93% rename from target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch rename to target/linux/generic/pending-6.6/720-02-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch index a7f7fbf47a..0c729acb7f 100644 --- a/target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch +++ b/target/linux/generic/pending-6.6/720-02-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch @@ -20,7 +20,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -785,8 +785,8 @@ static int rtl822x_write_mmd(struct phy_ +@@ -786,8 +786,8 @@ static int rtl822x_write_mmd(struct phy_ static int rtl822xb_config_init(struct phy_device *phydev) { bool has_2500, has_sgmii; @@ -30,7 +30,7 @@ Signed-off-by: Daniel Golle has_2500 = test_bit(PHY_INTERFACE_MODE_2500BASEX, phydev->host_interfaces) || -@@ -836,7 +836,29 @@ static int rtl822xb_config_init(struct p +@@ -837,7 +837,29 @@ static int rtl822xb_config_init(struct p if (ret < 0) return ret; diff --git a/target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch b/target/linux/generic/pending-6.6/720-03-net-phy-realtek-make-sure-paged-read-is-protected-by.patch similarity index 95% rename from target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch rename to target/linux/generic/pending-6.6/720-03-net-phy-realtek-make-sure-paged-read-is-protected-by.patch index d944b6aa5c..8b8dca8f27 100644 --- a/target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch +++ b/target/linux/generic/pending-6.6/720-03-net-phy-realtek-make-sure-paged-read-is-protected-by.patch @@ -18,7 +18,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1051,9 +1051,11 @@ static bool rtlgen_supports_2_5gbps(stru +@@ -1052,9 +1052,11 @@ static bool rtlgen_supports_2_5gbps(stru { int val; diff --git a/target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch b/target/linux/generic/pending-6.6/720-04-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch similarity index 93% rename from target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch rename to target/linux/generic/pending-6.6/720-04-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch index bf833a2b7a..8b20451979 100644 --- a/target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch +++ b/target/linux/generic/pending-6.6/720-04-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch @@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -909,7 +909,8 @@ static int rtl822x_config_aneg(struct ph +@@ -910,7 +910,8 @@ static int rtl822x_config_aneg(struct ph ret = phy_modify_paged_changed(phydev, 0xa5d, 0x12, MDIO_AN_10GBT_CTRL_ADV2_5G | diff --git a/target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch b/target/linux/generic/pending-6.6/720-05-net-phy-realtek-check-validity-of-10GbE-link-partner.patch similarity index 93% rename from target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch rename to target/linux/generic/pending-6.6/720-05-net-phy-realtek-check-validity-of-10GbE-link-partner.patch index 5ae6dcd7a8..1ba3353f19 100644 --- a/target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch +++ b/target/linux/generic/pending-6.6/720-05-net-phy-realtek-check-validity-of-10GbE-link-partner.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -949,6 +949,10 @@ static int rtl822x_read_status(struct ph +@@ -950,6 +950,10 @@ static int rtl822x_read_status(struct ph if (lpadv < 0) return lpadv; diff --git a/target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch b/target/linux/generic/pending-6.6/720-06-net-phy-realtek-introduce-rtl822x_probe.patch similarity index 87% rename from target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch rename to target/linux/generic/pending-6.6/720-06-net-phy-realtek-introduce-rtl822x_probe.patch index f81d7bf395..ee4de599ab 100644 --- a/target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch +++ b/target/linux/generic/pending-6.6/720-06-net-phy-realtek-introduce-rtl822x_probe.patch @@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle #define RTL8366RB_POWER_SAVE 0x15 #define RTL8366RB_POWER_SAVE_ON BIT(12) -@@ -1106,6 +1110,25 @@ static int rtl8221b_vn_cg_c45_match_phy_ +@@ -1107,6 +1111,25 @@ static int rtl8221b_vn_cg_c45_match_phy_ return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true); } @@ -50,7 +50,7 @@ Signed-off-by: Daniel Golle static int rtlgen_resume(struct phy_device *phydev) { int ret = genphy_resume(phydev); -@@ -1381,6 +1404,7 @@ static struct phy_driver realtek_drvs[] +@@ -1382,6 +1405,7 @@ static struct phy_driver realtek_drvs[] }, { PHY_ID_MATCH_EXACT(0x001cc838), .name = "RTL8226-CG 2.5Gbps PHY", @@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle .soft_reset = genphy_soft_reset, .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, -@@ -1392,6 +1416,7 @@ static struct phy_driver realtek_drvs[] +@@ -1393,6 +1417,7 @@ static struct phy_driver realtek_drvs[] }, { PHY_ID_MATCH_EXACT(0x001cc848), .name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY", @@ -66,7 +66,7 @@ Signed-off-by: Daniel Golle .soft_reset = genphy_soft_reset, .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, -@@ -1405,6 +1430,7 @@ static struct phy_driver realtek_drvs[] +@@ -1406,6 +1431,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vb_cg_c22_match_phy_device, .name = "RTL8221B-VB-CG 2.5Gbps PHY (C22)", @@ -74,7 +74,7 @@ Signed-off-by: Daniel Golle .soft_reset = genphy_soft_reset, .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, -@@ -1418,6 +1444,7 @@ static struct phy_driver realtek_drvs[] +@@ -1419,6 +1445,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vb_cg_c45_match_phy_device, .name = "RTL8221B-VB-CG 2.5Gbps PHY (C45)", @@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle .soft_reset = genphy_soft_reset, .config_init = rtl822xb_config_init, .get_rate_matching = rtl822xb_get_rate_matching, -@@ -1429,6 +1456,7 @@ static struct phy_driver realtek_drvs[] +@@ -1430,6 +1457,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vn_cg_c22_match_phy_device, .name = "RTL8221B-VM-CG 2.5Gbps PHY (C22)", @@ -90,7 +90,7 @@ Signed-off-by: Daniel Golle .soft_reset = genphy_soft_reset, .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, -@@ -1442,6 +1470,7 @@ static struct phy_driver realtek_drvs[] +@@ -1443,6 +1471,7 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vn_cg_c45_match_phy_device, .name = "RTL8221B-VN-CG 2.5Gbps PHY (C45)", diff --git a/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch b/target/linux/generic/pending-6.6/720-07-net-phy-realtek-detect-early-version-of-RTL8221B.patch similarity index 95% rename from target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch rename to target/linux/generic/pending-6.6/720-07-net-phy-realtek-detect-early-version-of-RTL8221B.patch index 698b54473f..cca5da0e13 100644 --- a/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch +++ b/target/linux/generic/pending-6.6/720-07-net-phy-realtek-detect-early-version-of-RTL8221B.patch @@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle Signed-off-by: Mieczyslaw Nalewaj --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1084,10 +1084,32 @@ static int rtl8226_match_phy_device(stru +@@ -1085,10 +1085,32 @@ static int rtl8226_match_phy_device(stru static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id, bool is_c45) { diff --git a/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch b/target/linux/generic/pending-6.6/720-08-net-phy-realtek-support-interrupt-of-RTL8221B.patch similarity index 89% rename from target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch rename to target/linux/generic/pending-6.6/720-08-net-phy-realtek-support-interrupt-of-RTL8221B.patch index f75dbc9e85..ee28bfbcfc 100644 --- a/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch +++ b/target/linux/generic/pending-6.6/720-08-net-phy-realtek-support-interrupt-of-RTL8221B.patch @@ -12,7 +12,7 @@ Signed-off-by: Jianhui Zhao --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1286,6 +1286,51 @@ static irqreturn_t rtl9000a_handle_inter +@@ -1287,6 +1287,51 @@ static irqreturn_t rtl9000a_handle_inter return IRQ_HANDLED; } @@ -64,7 +64,7 @@ Signed-off-by: Jianhui Zhao static struct phy_driver realtek_drvs[] = { { PHY_ID_MATCH_EXACT(0x00008201), -@@ -1452,6 +1497,8 @@ static struct phy_driver realtek_drvs[] +@@ -1453,6 +1498,8 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vb_cg_c22_match_phy_device, .name = "RTL8221B-VB-CG 2.5Gbps PHY (C22)", @@ -73,7 +73,7 @@ Signed-off-by: Jianhui Zhao .probe = rtl822x_probe, .soft_reset = genphy_soft_reset, .get_features = rtl822x_get_features, -@@ -1466,6 +1513,8 @@ static struct phy_driver realtek_drvs[] +@@ -1467,6 +1514,8 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vb_cg_c45_match_phy_device, .name = "RTL8221B-VB-CG 2.5Gbps PHY (C45)", @@ -82,7 +82,7 @@ Signed-off-by: Jianhui Zhao .probe = rtl822x_probe, .soft_reset = genphy_soft_reset, .config_init = rtl822xb_config_init, -@@ -1478,6 +1527,8 @@ static struct phy_driver realtek_drvs[] +@@ -1479,6 +1528,8 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vn_cg_c22_match_phy_device, .name = "RTL8221B-VM-CG 2.5Gbps PHY (C22)", @@ -91,7 +91,7 @@ Signed-off-by: Jianhui Zhao .probe = rtl822x_probe, .soft_reset = genphy_soft_reset, .get_features = rtl822x_get_features, -@@ -1492,6 +1543,8 @@ static struct phy_driver realtek_drvs[] +@@ -1493,6 +1544,8 @@ static struct phy_driver realtek_drvs[] }, { .match_phy_device = rtl8221b_vn_cg_c45_match_phy_device, .name = "RTL8221B-VN-CG 2.5Gbps PHY (C45)", From 1d976f83e40c48111892b06f59607f77b4f20eb1 Mon Sep 17 00:00:00 2001 From: Mathesh Velayudan <123v.mathesh@gmail.com> Date: Thu, 4 Jul 2024 17:39:51 +0530 Subject: [PATCH 10/23] bmips: add support for TP-Link TD-W8968 V3 TP-Link TD-W8968 v3 is an 300Mbps Wireless N USB ADSL2+ Modem Router based on Broadcom BCM6318 SoC. Hardware: CPU: Broadcom BCM6318, 333 MHz, 1 core Flash: 8MB RAM: 64 MB Ethernet: 4x 10/100 Mbps Wireless: 802.11b/g/n, BCM43217 LEDs/Buttons: 10x / 3x USB: 1x 2.0 Flash instructions: * Assign static IP 192.168.1.100 to PC * Unplug the power source * Press the RESET button at the router, don't release it yet! * Plug the power source. Wait for some seconds * Release the RESET button * Browse to http://192.168.1.1 * Upload the openwrt-bmips-bcm6318-tp-link_td-w8968-v3-squashfs-cfe.bin file * Wait some minutes until the firmware upgrade finish. Signed-off-by: Mathesh Velayudan <123v.mathesh@gmail.com> --- .../bcm6318/base-files/etc/board.d/01_leds | 3 +- .../bcm6318/base-files/etc/board.d/02_network | 3 +- .../base-files/etc/uci-defaults/09_fix_crc | 3 +- .../bmips/dts/bcm6318-tp-link-td-w8968-v3.dts | 253 ++++++++++++++++++ target/linux/bmips/image/bcm6318.mk | 20 ++ 5 files changed, 279 insertions(+), 3 deletions(-) create mode 100644 target/linux/bmips/dts/bcm6318-tp-link-td-w8968-v3.dts diff --git a/target/linux/bmips/bcm6318/base-files/etc/board.d/01_leds b/target/linux/bmips/bcm6318/base-files/etc/board.d/01_leds index 98355460a0..059a4f415a 100644 --- a/target/linux/bmips/bcm6318/base-files/etc/board.d/01_leds +++ b/target/linux/bmips/bcm6318/base-files/etc/board.d/01_leds @@ -6,7 +6,8 @@ board_config_update case "$(board_name)" in -comtrend,ar-5315u) +comtrend,ar-5315u |\ +tp-link,td-w8968-v3) ucidef_set_led_usbport "usb" "USB" "green:usb" "usb1-port1" "usb2-port1" ;; esac diff --git a/target/linux/bmips/bcm6318/base-files/etc/board.d/02_network b/target/linux/bmips/bcm6318/base-files/etc/board.d/02_network index 92b2e8f4d4..b821f6a545 100644 --- a/target/linux/bmips/bcm6318/base-files/etc/board.d/02_network +++ b/target/linux/bmips/bcm6318/base-files/etc/board.d/02_network @@ -5,7 +5,8 @@ board_config_update case "$(board_name)" in -comtrend,ar-5315u) +comtrend,ar-5315u |\ +tp-link,td-w8968-v3) ucidef_set_bridge_device switch ucidef_set_interface_lan "lan1 lan2 lan3 lan4" ;; diff --git a/target/linux/bmips/bcm6318/base-files/etc/uci-defaults/09_fix_crc b/target/linux/bmips/bcm6318/base-files/etc/uci-defaults/09_fix_crc index a52f0ecc40..df09e1d249 100644 --- a/target/linux/bmips/bcm6318/base-files/etc/uci-defaults/09_fix_crc +++ b/target/linux/bmips/bcm6318/base-files/etc/uci-defaults/09_fix_crc @@ -3,7 +3,8 @@ . /lib/functions.sh case "$(board_name)" in -comtrend,ar-5315u) +comtrend,ar-5315u) |\ +tp-link,td-w8968-v3) mtd fixtrx firmware ;; esac diff --git a/target/linux/bmips/dts/bcm6318-tp-link-td-w8968-v3.dts b/target/linux/bmips/dts/bcm6318-tp-link-td-w8968-v3.dts new file mode 100644 index 0000000000..59b209daed --- /dev/null +++ b/target/linux/bmips/dts/bcm6318-tp-link-td-w8968-v3.dts @@ -0,0 +1,253 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "bcm6318.dtsi" + +/ { + model = "TP-Link TD-W8968 V3"; + compatible = "tp-link,td-w8968-v3", "brcm,bcm6318"; + + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + wlan { + label = "wlan"; + gpios = <&gpio 9 GPIO_ACTIVE_LOW>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + gpios = <&gpio 33 GPIO_ACTIVE_LOW>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&gpio 34 GPIO_ACTIVE_LOW>; + linux,code = ; + debounce-interval = <60>; + }; + }; + + bcm43217-sprom { + compatible = "brcm,bcma-sprom"; + + pci-bus = <1>; + pci-dev = <0>; + + nvmem-cells = <&macaddr_cfe_6a0 1>; + nvmem-cell-names = "mac-address"; + + brcm,sprom = "brcm/bcm43217-sprom.bin"; + }; +}; + +&ehci { + status = "okay"; +}; + +ðernet { + status = "okay"; + + nvmem-cells = <&macaddr_cfe_6a0 0>; + nvmem-cell-names = "mac-address"; +}; + +&hsspi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <62500000>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + reg = <0>; + + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_cfe_6a0: macaddr@6a0 { + compatible = "mac-base"; + reg = <0x6a0 0x6>; + #nvmem-cell-cells = <1>; + }; + }; + }; + + partition@10000 { + compatible = "brcm,bcm963xx-imagetag"; + reg = <0x010000 0x7e0000>; + label = "firmware"; + }; + + partition@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_leds + &pinctrl_ephy0_act_led &pinctrl_ephy1_act_led + &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>; + + led@2 { + reg = <2>; + active-low; + function = LED_FUNCTION_WPS; + color = ; + }; + + led_power_green: led@3 { + reg = <3>; + active-high; + function = LED_FUNCTION_POWER; + color = ; + }; + + led@4 { + /* EPHY0 Act */ + reg = <4>; + brcm,hardware-controlled; + brcm,link-signal-sources = <4>; + }; + + led@5 { + /* EPHY1 Act */ + reg = <5>; + brcm,hardware-controlled; + brcm,link-signal-sources = <5>; + }; + + led@6 { + /* EPHY2 Act */ + reg = <6>; + brcm,hardware-controlled; + brcm,link-signal-sources = <6>; + }; + + led@7 { + /* EPHY3 Act */ + reg = <7>; + brcm,hardware-controlled; + brcm,link-signal-sources = <7>; + }; + + led@8 { + reg = <8>; + active-low; + function = LED_FUNCTION_WAN_ONLINE; + color = ; + }; + + led@10 { + reg = <10>; + active-low; + label = "green:dsl"; + }; + + led@13 { + reg = <13>; + active-low; + function = LED_FUNCTION_USB; + color = ; + }; + + led@16 { + reg = <16>; + active-low; + function = LED_FUNCTION_WLAN; + color = ; + }; +}; + +&ohci { + status = "okay"; +}; + +&pcie { + status = "okay"; +}; + +&pinctrl { + pinctrl_leds: leds { + function = "led"; + pins = "gpio2", "gpio3", + "gpio8", "gpio10", + "gpio13", "gpio16"; + }; +}; + +&switch0 { + ports { + port@0 { + reg = <0>; + label = "lan4"; + + phy-handle = <&phy1>; + phy-mode = "mii"; + }; + + port@1 { + reg = <1>; + label = "lan3"; + + phy-handle = <&phy2>; + phy-mode = "mii"; + }; + + port@2 { + reg = <2>; + label = "lan2"; + + phy-handle = <&phy3>; + phy-mode = "mii"; + }; + + port@3 { + reg = <3>; + label = "lan1"; + + phy-handle = <&phy4>; + phy-mode = "mii"; + }; + }; +}; + +&uart0 { + status = "okay"; +}; + +&usbh { + status = "okay"; +}; diff --git a/target/linux/bmips/image/bcm6318.mk b/target/linux/bmips/image/bcm6318.mk index bfd75cc077..286a30c2f4 100644 --- a/target/linux/bmips/image/bcm6318.mk +++ b/target/linux/bmips/image/bcm6318.mk @@ -12,3 +12,23 @@ define Device/comtrend_ar-5315u kmod-leds-bcm6328 endef TARGET_DEVICES += comtrend_ar-5315u + +define Device/tp-link_td-w8968-v3 + $(Device/bcm63xx-cfe) + DEVICE_VENDOR := TP-Link + DEVICE_MODEL := TD-W8968 + DEVICE_VARIANT := V3 + DEVICE_ALT0_VENDOR := TP-Link + DEVICE_ALT0_MODEL := TD-W8968 + DEVICE_ALT0_VARIANT := V4 + DEVICE_ALT1_VENDOR := TP-Link + DEVICE_ALT1_MODEL := TD-W8960N + DEVICE_ALT1_VARIANT := V5 + CHIP_ID := 6318 + CFE_BOARD_ID := 96318REF + FLASH_MB := 8 + DEVICE_PACKAGES += $(USB2_PACKAGES) \ + $(B43_PACKAGES) broadcom-43217-sprom \ + kmod-leds-bcm6328 +endef +TARGET_DEVICES += tp-link_td-w8968-v3 From 57c600dc2702954128c5f616e45f410fd6ecb0b1 Mon Sep 17 00:00:00 2001 From: Carsten Schuette Date: Wed, 17 Jul 2024 20:09:46 +0200 Subject: [PATCH 11/23] dnsmasq: Add EDNS0 Upstream support Forward client mac address and subnet on dns queries. Pi-hole and Adguard use this feature to send the originators ip address/subnet so it can be logged and not just the nat address of the router. This feature has been added since version 2.56 of dnsmasq and would be nice to expose this feature in openwrt. Signed-off-by: Carsten Schuette Link: https://github.com/openwrt/openwrt/pull/15965 Signed-off-by: Robert Marko --- package/network/services/dnsmasq/Makefile | 2 +- package/network/services/dnsmasq/files/dnsmasq.init | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 5224e996a4..0a597c03ce 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_UPSTREAM_VERSION:=2.90 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq/ diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 138a913f87..4cfb155424 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1108,6 +1108,9 @@ dnsmasq_start() [ "$addmac" = "1" ] && addmac= xappend "--add-mac${addmac:+="$addmac"}" } + append_bool "$cfg" stripmac "--strip-mac" + append_parm "$cfg" addsubnet "--add-subnet" + append_bool "$cfg" stripsubnet "--strip-subnet" dhcp_option_add "$cfg" "" 0 dhcp_option_add "$cfg" "" 2 From 7a7ea98400a80d762e1f6e6d29ceb25a13a997e0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 11 Aug 2024 15:38:27 -0700 Subject: [PATCH 12/23] trace-cmd: update to 3.3 Use local tarballs instead of upstream generated ones. Smaller. Fix version to be compatible with apk. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16219 Signed-off-by: Robert Marko --- package/devel/trace-cmd/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index c1a24dc171..22d37752e6 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -1,12 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trace-cmd -PKG_VERSION:=v3.2 +PKG_VERSION:=3.3 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/ -PKG_HASH:=62af2c6062eeb434925921bb5936774b0a0e17a5f86671fa2ea2f40704a080cd +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=$(PKG_NAME)-v$(PKG_VERSION) +PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd +PKG_MIRROR_HASH:=7a4f9c3a18a01012cd76ab9a0a2c4447aed8293d005679d5228ef2aef243445c PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING @@ -37,8 +38,6 @@ MAKE_FLAGS += \ NO_LIBZSTD=1 \ prefix=/usr -TARGET_CFLAGS += --std=gnu99 -D_GNU_SOURCE - define Package/trace-cmd/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/traceevent/plugins $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/trace-cmd $(1)/usr/bin/ From 4f2dadcf95e1ba18bbb2d59f3c7e20e3d4da5208 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 14 Aug 2024 19:59:19 -0700 Subject: [PATCH 13/23] ramips: mt7621_nand: don't set owner Found with coccinelle: No need to set .owner here. The core will do it. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16217 Signed-off-by: Robert Marko --- target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c b/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c index 880c8578bd..fba389e5a9 100644 --- a/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c +++ b/target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c @@ -1248,7 +1248,6 @@ static int mt7621_nfc_init_chip(struct mt7621_nfc *nfc) nand->ecc.write_oob_raw = mt7621_nfc_write_oob_raw; mtd = nand_to_mtd(nand); - mtd->owner = THIS_MODULE; mtd->dev.parent = nfc->dev; mtd->name = MT7621_NFC_NAME; mtd_set_ooblayout(mtd, &mt7621_nfc_ooblayout_ops); @@ -1338,7 +1337,6 @@ static struct platform_driver mt7621_nfc_driver = { .remove = mt7621_nfc_remove, .driver = { .name = MT7621_NFC_NAME, - .owner = THIS_MODULE, .of_match_table = mt7621_nfc_id_table, }, }; From c099523d66a34dede910729fbacbda5dd45640ca Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Fri, 28 Jun 2024 13:14:59 -0400 Subject: [PATCH 14/23] armsr: use console=tty1 to make console more readily available Like x86, armsr is frequently virtualized, and is used for development and debugging. Kernel messages should be more readily apparent by default. This can be achieved by adding console=tty1 to the kernel command line, enabling the console on a (possibly virtual) display and keyboard, in addition to a serial port. This also enables failsafe on tty1. Failsafe mode operates on consoles known by the kernel, without regard to /etc/inittab. armsr's /etc/inittab is also updated to specify tty1 instead of tty0. tty1 is technically more correct: tty1 is the first virtual console, where tty0 reflects the current active virtual console (which is likely to be tty1). This configuration matches x86, which is another target commonly used for virtualization, development, and debugging in the same way. x86's kernel command line had specified console=tty0, although console=tty1 is more correct for the reasons given above. This also brings x86's kernel command line console= into agreement with its /etc/inittab, which already used tty1. Signed-off-by: Mark Mentovai Link: https://github.com/openwrt/openwrt/pull/16213 Signed-off-by: Robert Marko --- target/linux/armsr/base-files/etc/inittab | 2 +- target/linux/armsr/image/Makefile | 1 + target/linux/x86/image/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/linux/armsr/base-files/etc/inittab b/target/linux/armsr/base-files/etc/inittab index b3033a3ced..7ca0231a22 100644 --- a/target/linux/armsr/base-files/etc/inittab +++ b/target/linux/armsr/base-files/etc/inittab @@ -2,7 +2,7 @@ ::shutdown:/etc/init.d/rcS K shutdown ttyAMA0::askfirst:/usr/libexec/login.sh @GRUB_SERIAL@::askfirst:/usr/libexec/login.sh -tty0::askfirst:/usr/libexec/login.sh +tty1::askfirst:/usr/libexec/login.sh hvc0::askfirst:/usr/libexec/login.sh ttymxc0::askfirst:/usr/libexec/login.sh ttymxc1::askfirst:/usr/libexec/login.sh diff --git a/target/linux/armsr/image/Makefile b/target/linux/armsr/image/Makefile index 7d04a2e8f6..66f027c732 100644 --- a/target/linux/armsr/image/Makefile +++ b/target/linux/armsr/image/Makefile @@ -12,6 +12,7 @@ GRUB_TERMINAL_CONFIG = GRUB_CONSOLE_CMDLINE = earlycon ifneq ($(CONFIG_GRUB_CONSOLE),) + GRUB_CONSOLE_CMDLINE += console=tty1 GRUB_TERMINALS += console endif diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 6e59f2e465..29bebeb748 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -12,7 +12,7 @@ GRUB_TERMINAL_CONFIG = GRUB_CONSOLE_CMDLINE = ifneq ($(CONFIG_GRUB_CONSOLE),) - GRUB_CONSOLE_CMDLINE += console=tty0 + GRUB_CONSOLE_CMDLINE += console=tty1 GRUB_TERMINALS += console endif From eae339fa7246a08268be53c5af9929d429f5c134 Mon Sep 17 00:00:00 2001 From: FUKAUMI Naoki Date: Fri, 23 Aug 2024 13:16:15 +0900 Subject: [PATCH 15/23] uboot-rockchip: fix model name for Radxa ROCK 3A, 5A, and 5B This patch fixes model name in dts as below: Radxa ROCK3 model A -> Radxa ROCK 3A Radxa ROCK 5 model A -> Radxa ROCK 5A Radxa ROCK 5 model B -> Radxa ROCK 5B Signed-off-by: FUKAUMI Naoki Link: https://github.com/openwrt/openwrt/pull/16232 Signed-off-by: Hauke Mehrtens --- ...ip-correct-the-model-name-for-Radxa-.patch | 29 +++++++++++++ ...ip-Correct-the-model-names-for-Radxa.patch | 43 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 package/boot/uboot-rockchip/patches/010-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch create mode 100644 package/boot/uboot-rockchip/patches/011-arm64-dts-rockchip-Correct-the-model-names-for-Radxa.patch diff --git a/package/boot/uboot-rockchip/patches/010-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch b/package/boot/uboot-rockchip/patches/010-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch new file mode 100644 index 0000000000..6bf47e2a5b --- /dev/null +++ b/package/boot/uboot-rockchip/patches/010-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch @@ -0,0 +1,29 @@ +From 626a479873b6a680b3227c4852bde4a1f2c17fdf Mon Sep 17 00:00:00 2001 +From: Chukun Pan +Date: Fri, 19 Apr 2024 18:30:19 +0800 +Subject: [PATCH 1/3] arm64: dts: rockchip: correct the model name for Radxa + ROCK 3A + +According to https://radxa.com/products/rock3/3a, +the name of this board should be "Radxa ROCK 3A". + +Suggested-by: FUKAUMI Naoki +Signed-off-by: Chukun Pan +Reviewed-by: Dragan Simic +Link: https://lore.kernel.org/r/20240419103019.992586-3-amadeus@jmu.edu.cn +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/dts/upstream/src/arm64/rockchip/rk3568-rock-3a.dts ++++ b/dts/upstream/src/arm64/rockchip/rk3568-rock-3a.dts +@@ -8,7 +8,7 @@ + #include "rk3568.dtsi" + + / { +- model = "Radxa ROCK3 Model A"; ++ model = "Radxa ROCK 3A"; + compatible = "radxa,rock3a", "rockchip,rk3568"; + + aliases { diff --git a/package/boot/uboot-rockchip/patches/011-arm64-dts-rockchip-Correct-the-model-names-for-Radxa.patch b/package/boot/uboot-rockchip/patches/011-arm64-dts-rockchip-Correct-the-model-names-for-Radxa.patch new file mode 100644 index 0000000000..82918e3899 --- /dev/null +++ b/package/boot/uboot-rockchip/patches/011-arm64-dts-rockchip-Correct-the-model-names-for-Radxa.patch @@ -0,0 +1,43 @@ +From 45e831033f7a00a14f64afa1e34c476a9ff0f9f0 Mon Sep 17 00:00:00 2001 +From: Dragan Simic +Date: Thu, 18 Apr 2024 18:26:20 +0200 +Subject: [PATCH] arm64: dts: rockchip: Correct the model names for Radxa ROCK + 5 boards + +Correct the descriptions of a few Radxa boards, according to the up-to-date +documentation from Radxa and the detailed explanation from Naoki. [1] To sum +it up, the short naming, as specified by Radxa, is preferred. + +[1] https://lore.kernel.org/linux-rockchip/B26C732A4DCEA9B3+282b8775-601b-4d4a-a513-4924b7940076@radxa.com/ + +Suggested-by: FUKAUMI Naoki +Signed-off-by: Dragan Simic +Link: https://lore.kernel.org/r/6931289a252dc2d6c7bfd2388835c5e98ba0d8c9.1713457260.git.dsimic@manjaro.org +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/dts/upstream/src/arm64/rockchip/rk3588-rock-5b.dts ++++ b/dts/upstream/src/arm64/rockchip/rk3588-rock-5b.dts +@@ -7,7 +7,7 @@ + #include "rk3588.dtsi" + + / { +- model = "Radxa ROCK 5 Model B"; ++ model = "Radxa ROCK 5B"; + compatible = "radxa,rock-5b", "rockchip,rk3588"; + + aliases { +--- a/dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts ++++ b/dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts +@@ -8,7 +8,7 @@ + #include "rk3588s.dtsi" + + / { +- model = "Radxa ROCK 5 Model A"; ++ model = "Radxa ROCK 5A"; + compatible = "radxa,rock-5a", "rockchip,rk3588s"; + + aliases { From f1c83cf1d59a707f51f9c622505a1ee05294c48f Mon Sep 17 00:00:00 2001 From: FUKAUMI Naoki Date: Fri, 23 Aug 2024 13:18:25 +0900 Subject: [PATCH 16/23] rockchip: fix model name for Radxa ROCK 3A This patch fixes model name in dts as below: Radxa ROCK3 model A -> Radxa ROCK 3A Signed-off-by: FUKAUMI Naoki Link: https://github.com/openwrt/openwrt/pull/16232 Signed-off-by: Hauke Mehrtens --- ...ip-correct-the-model-name-for-Radxa-.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 target/linux/rockchip/patches-6.6/060-01-v6.10-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch diff --git a/target/linux/rockchip/patches-6.6/060-01-v6.10-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch b/target/linux/rockchip/patches-6.6/060-01-v6.10-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch new file mode 100644 index 0000000000..d03039d978 --- /dev/null +++ b/target/linux/rockchip/patches-6.6/060-01-v6.10-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch @@ -0,0 +1,29 @@ +From 626a479873b6a680b3227c4852bde4a1f2c17fdf Mon Sep 17 00:00:00 2001 +From: Chukun Pan +Date: Fri, 19 Apr 2024 18:30:19 +0800 +Subject: [PATCH] arm64: dts: rockchip: correct the model name for Radxa ROCK + 3A + +According to https://radxa.com/products/rock3/3a, +the name of this board should be "Radxa ROCK 3A". + +Suggested-by: FUKAUMI Naoki +Signed-off-by: Chukun Pan +Reviewed-by: Dragan Simic +Link: https://lore.kernel.org/r/20240419103019.992586-3-amadeus@jmu.edu.cn +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +@@ -8,7 +8,7 @@ + #include "rk3568.dtsi" + + / { +- model = "Radxa ROCK3 Model A"; ++ model = "Radxa ROCK 3A"; + compatible = "radxa,rock3a", "rockchip,rk3568"; + + aliases { From 3774f3272ee976b922306a881b6eb603e79f81ed Mon Sep 17 00:00:00 2001 From: Goetz Goerisch Date: Fri, 7 Jun 2024 14:42:32 +0200 Subject: [PATCH 17/23] 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 Link: https://github.com/openwrt/openwrt/pull/15652 Signed-off-by: Hauke Mehrtens --- .../patches/007-nsa310-uboot-generic.patch | 8 ++++---- .../patches/008-nsa325-uboot-generic.patch | 4 ++-- package/boot/uboot-lantiq/Makefile | 4 ++-- ...PS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch | 6 +++--- package/kernel/mt7621-qtn-rgmii/Makefile | 2 +- package/utils/zyxel-bootconfig/Makefile | 4 ++-- target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts | 2 +- .../linux/ath79/dts/qca9558_zyxel_emg2926_q10a.dts | 2 +- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 2 +- target/linux/ath79/image/generic.mk | 4 ++-- target/linux/ath79/image/nand.mk | 2 +- ...rt-for-all-the-downstream-rpi-sound-card-dr.patch | 2 +- .../arch/arm/boot/dts/qcom/qcom-ipq4018-nbg6617.dts | 4 ++-- .../arch/arm/boot/dts/qcom/qcom-ipq4018-wre6606.dts | 2 +- target/linux/ipq40xx/image/generic.mk | 6 +++--- .../arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts | 2 +- target/linux/ipq806x/image/generic.mk | 6 +++--- .../files-6.1/arch/arm/boot/dts/kirkwood-nsa310b.dts | 2 +- .../arch/arm/boot/dts/marvell/kirkwood-nsa310b.dts | 2 +- target/linux/kirkwood/image/Makefile | 6 +++--- .../arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts | 2 +- .../mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts | 2 +- .../mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts | 2 +- target/linux/lantiq/image/ar9.mk | 2 +- target/linux/lantiq/image/vr9.mk | 4 ++-- .../linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts | 2 +- .../mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts | 2 +- target/linux/mediatek/image/filogic.mk | 4 ++-- .../linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts | 2 +- .../ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts | 2 +- .../ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts | 2 +- .../linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts | 2 +- .../linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts | 2 +- .../linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts | 2 +- target/linux/ramips/dts/mt7621_zyxel_nr7101.dts | 2 +- target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts | 2 +- target/linux/ramips/dts/mt7621_zyxel_nwa55axe.dts | 2 +- target/linux/ramips/dts/mt7621_zyxel_wap6805.dts | 2 +- target/linux/ramips/dts/mt7621_zyxel_wsm20.dts | 2 +- .../ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts | 2 +- target/linux/ramips/dts/rt3052_zyxel_keenetic.dts | 2 +- target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts | 2 +- target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts | 2 +- .../linux/ramips/dts/rt5350_zyxel_keenetic-4g-b.dts | 2 +- .../ramips/dts/rt5350_zyxel_keenetic-lite-b.dts | 2 +- .../linux/ramips/dts/rt5350_zyxel_keenetic-start.dts | 2 +- target/linux/ramips/image/mt7620.mk | 8 ++++---- target/linux/ramips/image/mt7621.mk | 12 ++++++------ target/linux/ramips/image/mt76x8.mk | 2 +- target/linux/ramips/image/rt305x.mk | 12 ++++++------ .../realtek/dts-5.15/rtl8380_zyxel_gs1900-10hp.dts | 2 +- .../realtek/dts-5.15/rtl8380_zyxel_gs1900-8.dts | 2 +- .../realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v1.dts | 2 +- .../realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v2.dts | 2 +- .../realtek/dts-5.15/rtl8382_zyxel_gs1900-16.dts | 2 +- .../realtek/dts-5.15/rtl8382_zyxel_gs1900-24-v1.dts | 2 +- .../realtek/dts-5.15/rtl8382_zyxel_gs1900-24e.dts | 2 +- .../realtek/dts-5.15/rtl8382_zyxel_gs1900-24ep.dts | 2 +- .../dts-5.15/rtl8382_zyxel_gs1900-24hp-v1.dts | 2 +- .../dts-5.15/rtl8382_zyxel_gs1900-24hp-v2.dts | 2 +- target/linux/realtek/image/common.mk | 2 +- target/linux/realtek/image/rtl838x.mk | 2 +- 62 files changed, 93 insertions(+), 93 deletions(-) diff --git a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch index 16a1f08c84..1da50467ef 100644 --- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch +++ b/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> " diff --git a/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch index db9a7a6fb2..71a4a65197 100644 --- a/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch +++ b/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> " diff --git a/package/boot/uboot-lantiq/Makefile b/package/boot/uboot-lantiq/Makefile index 927fbcb9c0..b569232b3d 100644 --- a/package/boot/uboot-lantiq/Makefile +++ b/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 diff --git a/package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch b/package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch index 3f77d98476..91d9099f12 100644 --- a/package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch +++ b/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 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 @@ -51,7 +51,7 @@ Signed-off-by: Luka Perkov +/* + * Copyright (C) 2013 Luka Perkov + * -+ * 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 + +#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 */ diff --git a/package/kernel/mt7621-qtn-rgmii/Makefile b/package/kernel/mt7621-qtn-rgmii/Makefile index f5587f5363..35470e1443 100644 --- a/package/kernel/mt7621-qtn-rgmii/Makefile +++ b/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) diff --git a/package/utils/zyxel-bootconfig/Makefile b/package/utils/zyxel-bootconfig/Makefile index eb2dd79b82..4e1a74aeaa 100644 --- a/package/utils/zyxel-bootconfig/Makefile +++ b/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 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 diff --git a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts index 4372a07d51..828096f8f6 100644 --- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts +++ b/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; diff --git a/target/linux/ath79/dts/qca9558_zyxel_emg2926_q10a.dts b/target/linux/ath79/dts/qca9558_zyxel_emg2926_q10a.dts index c00109a5b4..bf8d0f2f95 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_emg2926_q10a.dts +++ b/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"; }; diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 19f1245022..463553fe27 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/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; diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 98968241e9..459d595a42 100644 --- a/target/linux/ath79/image/generic.mk +++ b/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 diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 1a7eebc92a..a3bdedaf6d 100644 --- a/target/linux/ath79/image/nand.mk +++ b/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 diff --git a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch index b55df94070..0b77d89e80 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch +++ b/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 +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: diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-nbg6617.dts index f8e24ca53d..957ccb306c 100644 --- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-nbg6617.dts +++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-nbg6617.dts @@ -8,7 +8,7 @@ #include / { - 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 diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wre6606.dts index d59c41fab1..83ae05c626 100644 --- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wre6606.dts +++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-wre6606.dts @@ -22,7 +22,7 @@ #include / { - model = "ZyXEL WRE6606"; + model = "Zyxel WRE6606"; compatible = "zyxel,wre6606"; aliases { diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 929cff72ea..0aff89afa3 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/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 diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts index 7d22b4f541..9a9251e9b9 100644 --- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts @@ -4,7 +4,7 @@ #include / { - model = "ZyXEL NBG6817"; + model = "Zyxel NBG6817"; compatible = "zyxel,nbg6817", "qcom,ipq8065", "qcom,ipq8064"; memory@0 { diff --git a/target/linux/ipq806x/image/generic.mk b/target/linux/ipq806x/image/generic.mk index b5bf8898ab..112793d5fd 100644 --- a/target/linux/ipq806x/image/generic.mk +++ b/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 diff --git a/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nsa310b.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nsa310b.dts index 12e51d6656..594be97929 100644 --- a/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nsa310b.dts +++ b/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 { diff --git a/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nsa310b.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nsa310b.dts index 12e51d6656..594be97929 100644 --- a/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nsa310b.dts +++ b/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 { diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index e64785c5a1..eaced92657 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/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 \ diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts index 760bced2d2..cf850ad5d9 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts +++ b/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"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts index 4a7f63b177..247b811b4f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts +++ b/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 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts index 376cdaeb61..a7fd3d3ec8 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts +++ b/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 { diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index 3a301f3655..f4a15cfb3e 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/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 diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index dc307e1ee4..d4bded9cae 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/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 diff --git a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts index 54df8c054a..95247eba9d 100644 --- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts +++ b/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 { diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts index 29961e528c..9e7449b17f 100644 --- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts +++ b/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 { diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 453bdf1046..40e58f9754 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/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 diff --git a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts index d095b45630..9921db770a 100644 --- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts index 899479781e..eb3e8aac54 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts index dd1d256f41..ff4667f458 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts index 0ba185b7eb..b5722d2427 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts b/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts index edc861db61..9eed123157 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts b/target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts index ca8adfe10e..e121077b0a 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts b/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts index 756d4bd6e6..070ea4a13f 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts b/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts index 2cdaa40a1c..1ae3b9ad63 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7621_zyxel_nwa55axe.dts b/target/linux/ramips/dts/mt7621_zyxel_nwa55axe.dts index 7f0a6d2cdf..0dc4943cb4 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_nwa55axe.dts +++ b/target/linux/ramips/dts/mt7621_zyxel_nwa55axe.dts @@ -2,5 +2,5 @@ / { compatible = "zyxel,nwa55axe", "mediatek,mt7621-soc"; - model = "ZyXEL NWA55AXE"; + model = "Zyxel NWA55AXE"; }; diff --git a/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts b/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts index eabfcc2ef0..b3e8f6db74 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7621_zyxel_wsm20.dts b/target/linux/ramips/dts/mt7621_zyxel_wsm20.dts index 6bf65a0218..42dc716027 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_wsm20.dts +++ b/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; diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index 70956724fb..3e59fc6bf4 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/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; diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts index e7db3eda15..c7285150d9 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts +++ b/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; diff --git a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts index 8dee38c1f8..fc6cd21f3c 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts +++ b/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; diff --git a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts index f00fd58b71..ce776d4603 100644 --- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts +++ b/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; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-4g-b.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-4g-b.dts index d37e4189a8..511d97a336 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-4g-b.dts +++ b/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; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts index 658a71066a..433701397a 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts +++ b/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; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts index 663b9a3d8c..459350fade 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts +++ b/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; diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 51811a86ea..9f3a8dce0e 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/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 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 5f6399eaed..18dbbcadf3 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/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 diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 71f09f816f..1eae3d3dee 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/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 diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index 815e03a8d4..f52098c733 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/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 diff --git a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-10hp.dts index 82df6789a9..190a77b7ff 100644 --- a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-10hp.dts +++ b/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 { diff --git a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8.dts b/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8.dts index 7aa1cc274c..548e83ba73 100644 --- a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8.dts +++ b/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 { diff --git a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v1.dts b/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v1.dts index 5ee340eac6..386edfb015 100644 --- a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v1.dts +++ b/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 { diff --git a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v2.dts b/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v2.dts index 0768462255..2702f2ba1c 100644 --- a/target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8hp-v2.dts +++ b/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 { diff --git a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-16.dts b/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-16.dts index ac2eea7015..6010da2e26 100644 --- a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-16.dts +++ b/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 { diff --git a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24-v1.dts b/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24-v1.dts index 81482dde10..6d98e7fae1 100644 --- a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24-v1.dts +++ b/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>; diff --git a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24e.dts b/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24e.dts index 3d00034a3b..b455ddf23a 100644 --- a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24e.dts +++ b/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 { diff --git a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24ep.dts b/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24ep.dts index 8a77121f4c..25c82f089e 100644 --- a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24ep.dts +++ b/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 { diff --git a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v1.dts b/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v1.dts index 7bb3410a31..fa9bef89d6 100644 --- a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v1.dts +++ b/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>; diff --git a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v2.dts b/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v2.dts index 7b6a9a1e7f..93011cbdaa 100644 --- a/target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24hp-v2.dts +++ b/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 { diff --git a/target/linux/realtek/image/common.mk b/target/linux/realtek/image/common.mk index 37370f1999..27fcea86ec 100644 --- a/target/linux/realtek/image/common.mk +++ b/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 := \ diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk index 7c64d8d667..05574e5375 100644 --- a/target/linux/realtek/image/rtl838x.mk +++ b/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 From 19d770d7b91aaca1de18281dea0da8616df34c6c Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Sun, 4 Aug 2024 22:47:47 +0200 Subject: [PATCH 18/23] mediatek: filogic: add support for Cudy AP3000 Outdoor Hardware highlights: - MediaTek MT7981 WiSoC - 256MB DDR3 RAM - 64MB SPI-NAND - MediaTek MT7981 2x2 DBDC 802.11ax 2T2R (2.4 / 5) - 1x LED in two colors - 2x Button - 1x 1GbE - Two detachable antenas, two internal pcb antenas - PoE powered (standalone) MAC: LAN MAC: label mac 2.4G MAC: label mac -1 5G MAC: label mac How to install: 1. Apply Cudy Intermediate OpenWrt image for AP3000 Outdoor V1 2. Install OpenWrt sysupgrade image Signed-off-by: Pawel Dembicki Link: https://github.com/openwrt/openwrt/pull/16156 Signed-off-by: Hauke Mehrtens --- .../lib/preinit/05_set_preinit_iface | 1 + .../dts/mt7981b-cudy-ap3000outdoor-v1.dts | 209 ++++++++++++++++++ .../filogic/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/ieee80211/11_fix_wifi_mac | 1 + target/linux/mediatek/image/filogic.mk | 17 ++ 5 files changed, 229 insertions(+) create mode 100644 target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts diff --git a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface index 6dfa52c291..8e74c577cd 100644 --- a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface +++ b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface @@ -6,6 +6,7 @@ set_preinit_iface() { ip link set eth1 up ifname=eth1 ;; + cudy,ap3000outdoor-v1|\ cudy,re3000-v1|\ ubnt,unifi-6-lr|\ zyxel,nwa50ax-pro) diff --git a/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts new file mode 100644 index 0000000000..62e4063947 --- /dev/null +++ b/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts @@ -0,0 +1,209 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) + +/dts-v1/; + +#include + +#include "mt7981.dtsi" + +/ { + model = "Cudy AP3000 Outdoor v1"; + compatible = "cudy,ap3000outdoor-v1", "mediatek,mt7981-spim-snand-rfb"; + + aliases { + label-mac-device = &gmac1; + led-boot = &led_status_green; + led-failsafe = &led_status_red; + led-running = &led_status_green; + led-upgrade = &led_status_red; + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + gpio-keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&pio 1 GPIO_ACTIVE_LOW>; + }; + + wps { + label = "wps"; + linux,code = ; + gpios = <&pio 0 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_status_green: led@0 { + function = LED_FUNCTION_STATUS; + color = ; + gpios = <&pio 10 GPIO_ACTIVE_HIGH>; + }; + + led_status_red: led_1 { + function = LED_FUNCTION_POWER; + color = ; + gpios = <&pio 11 GPIO_ACTIVE_HIGH>; + }; + }; + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + + antctrl { + /* Not sure if this pin does anything. + * It was taken from GPL sources. + * Intermediate image doesn't have it. + */ + gpio-export,name = "antctrl"; + gpio-export,output = <1>; + gpios = <&pio 7 GPIO_ACTIVE_HIGH>; + }; + }; + + watchdog-hw { + compatible = "linux,wdt-gpio"; + gpios = <&pio 6 GPIO_ACTIVE_HIGH>; + hw_algo = "level"; + hw_margin_ms = <10000>; + always-running; + }; +}; + +&uart0 { + status = "okay"; +}; + +&watchdog { + status = "okay"; +}; + +ð { + pinctrl-names = "default"; + pinctrl-0 = <&mdio_pins>; + + status = "okay"; + + gmac1: mac@1 { + compatible = "mediatek,eth-mac"; + reg = <1>; + phy-mode = "gmii"; + phy-handle = <&int_gbe_phy>; + nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_bdinfo_de00 1>; + }; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi0_flash_pins>; + status = "okay"; + + spi_nand: flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-nand"; + reg = <0>; + spi-max-frequency = <52000000>; + + spi-cal-enable; + spi-cal-mode = "read-data"; + spi-cal-datalen = <7>; + spi-cal-data = /bits/ 8 <0x53 0x50 0x49 0x4E 0x41 0x4E 0x44>; + spi-cal-addrlen = <5>; + spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>; + + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + mediatek,nmbm; + mediatek,bmt-max-ratio = <1>; + mediatek,bmt-max-reserved-blocks = <64>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "BL2"; + reg = <0x00000 0x0100000>; + read-only; + }; + + partition@100000 { + label = "u-boot-env"; + reg = <0x0100000 0x0080000>; + read-only; + }; + + factory: partition@180000 { + label = "Factory"; + reg = <0x180000 0x0200000>; + read-only; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eeprom_factory_0: eeprom@0 { + reg = <0x0 0x1000>; + }; + }; + }; + + partition@380000 { + label = "bdinfo"; + reg = <0x380000 0x0040000>; + read-only; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_bdinfo_de00: macaddr@de00 { + compatible = "mac-base"; + reg = <0xde00 0x6>; + #nvmem-cell-cells = <1>; + }; + }; + + }; + + partition@3C0000 { + label = "FIP"; + reg = <0x3C0000 0x0200000>; + read-only; + }; + + partition@580000 { + label = "ubi"; + reg = <0x5C0000 0x4000000>; + compatible = "linux,ubi"; + }; + }; + }; +}; + + +&pio { + spi0_flash_pins: spi0-pins { + mux { + function = "spi"; + groups = "spi0", "spi0_wp_hold"; + }; + }; +}; + +&wifi { + status = "okay"; + nvmem-cells = <&eeprom_factory_0>; + nvmem-cell-names = "eeprom"; +}; 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 cf48926ad1..abe7682dfb 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 @@ -87,6 +87,7 @@ mediatek_setup_interfaces() mercusys,mr90x-v1) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2" eth1 ;; + cudy,ap3000outdoor-v1|\ cudy,re3000-v1|\ netgear,wax220|\ ubnt,unifi-6-plus|\ diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 1605c0086d..ff9e9f881c 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -75,6 +75,7 @@ case "$board" in [ "$PHYNBR" = "0" ] && echo "$addr" > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_setbit_la $(macaddr_add $addr 1) > /sys${DEVPATH}/macaddress ;; + cudy,ap3000outdoor-v1|\ cudy,m3000-v1|\ cudy,wr3000-v1) addr=$(mtd_get_mac_binary bdinfo 0xde00) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 40e58f9754..e21794600d 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -507,6 +507,23 @@ define Device/confiabits_mt7981 endef TARGET_DEVICES += confiabits_mt7981 +define Device/cudy_ap3000outdoor-v1 + DEVICE_VENDOR := Cudy + DEVICE_MODEL := AP3000 Outdoor + DEVICE_VARIANT := v1 + DEVICE_DTS := mt7981b-cudy-ap3000outdoor-v1 + DEVICE_DTS_DIR := ../dts + SUPPORTED_DEVICES += R51 + UBINIZE_OPTS := -E 5 + BLOCKSIZE := 128k + PAGESIZE := 2048 + IMAGE_SIZE := 65536k + KERNEL_IN_UBI := 1 + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware +endef +TARGET_DEVICES += cudy_ap3000outdoor-v1 + define Device/cudy_m3000-v1 DEVICE_VENDOR := Cudy DEVICE_MODEL := M3000 From 0e8b701794d3c73117132459b6091f24aabd7d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 28 Jul 2024 08:11:39 +0000 Subject: [PATCH 19/23] ustream-ssl: update to Git HEAD (2024-07-28) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 99bd3d2b167c ustream-openssl: fix compilation with OPENSSL_NO_DEPRECATED Signed-off-by: Petr Štetiar Link: https://github.com/openwrt/openwrt/pull/16020 Signed-off-by: Hauke Mehrtens --- package/libs/ustream-ssl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index b9c477f2ae..11ab857606 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git -PKG_SOURCE_DATE:=2024-04-19 -PKG_SOURCE_VERSION:=524a76e5af78fa577c46e0d24bdedd4254e07cd4 -PKG_MIRROR_HASH:=638a3143013c7b60faa0e92f466a4245c635b72a7a61baa84dc9fca000991999 +PKG_SOURCE_DATE:=2024-07-28 +PKG_SOURCE_VERSION:=99bd3d2b167ccdffb6de072d02c380cb37b23e33 +PKG_MIRROR_HASH:=d3a07151ec361cc4483406a6d01ebbf6ddf627e54f5a5b6676f265614797ee84 CMAKE_INSTALL:=1 PKG_LICENSE:=ISC From ecfb0958663ee339667284f0ab0843a1a12123d3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 25 Aug 2024 21:24:44 +0200 Subject: [PATCH 20/23] mt76: update to Git HEAD (2024-08-25) dbc9b0df7c01 linux-firmware: update firmware for MT7996 4e8167b94175 wifi: mt76: connac: fix checksum offload fields of connac3 RXD 084eaaf4792e wifi: mt76: mt7915: fix sta poll list corruption on hw restart aea16bfe8d50 firmware: update MT7981 firmware to version 20240507201102 65bbd4c394a9 firmware: update MT7986 firmware to version 20240507160203 1f4ac8faa529 wifi: mt76: connac: move mt7615_mcu_del_wtbl_all to connac b76f16ea6521 wifi: mt76: mt7915: improve hardware restart reliability e6afe9218a27 wifi: mt76: mt7915: fix unused variable error d6611d015efd firmware: update mt7916/mt7981/mt7986 firmware to version 20240823 ddeb304aae6d wifi: mt76: mt7921: fix wrong UNII-4 freq range check for the channel usage 904ef52a8d04 wifi: mt76: mt7996: fix uninitialized TLV data Signed-off-by: Felix Fietkau --- package/kernel/mt76/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 5e5c378953..a07175d4d2 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2024-08-21 -PKG_SOURCE_VERSION:=a5e630ef458ce7b91bf522247ef3320ed5845e2a -PKG_MIRROR_HASH:=a16f647206d68d67f9b2b134935f27ed66b7302a4ca8243842987dcfafbe8317 +PKG_SOURCE_DATE:=2024-08-25 +PKG_SOURCE_VERSION:=904ef52a8d04f6808284011579fdd45418f643d9 +PKG_MIRROR_HASH:=4e285ac767336aab56006fc9f8ca1c35d639926b03de1d6d1667ffc939d81c87 PKG_MAINTAINER:=Felix Fietkau PKG_USE_NINJA:=0 From ebe7c5f1a3bc4cdf0e2fbc1f1692773df81b848b Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 25 Aug 2024 23:25:41 +0200 Subject: [PATCH 21/23] uqmi: update to latest HEAD 28b48a1 uim: add support for ICC communication channel f582e00 qmi: fix dynamic array macro d381f80 data: add support for ICC channel Signed-off-by: David Bauer --- package/network/utils/uqmi/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/uqmi/Makefile b/package/network/utils/uqmi/Makefile index d4ed1e4494..b0433da96a 100644 --- a/package/network/utils/uqmi/Makefile +++ b/package/network/utils/uqmi/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uqmi.git -PKG_SOURCE_DATE:=2024-04-24 -PKG_SOURCE_VERSION:=e7207bec95f02f2f7a98254d642186a082af838d -PKG_MIRROR_HASH:=53e83720472f07cb9bb3e2b68ea6c379fc8c43ed8f93227bcb3d06c94a32a669 +PKG_SOURCE_DATE:=2024-08-25 +PKG_SOURCE_VERSION:=28b48a10dbcd1177095b73c6d8086d10114f49b8 +PKG_MIRROR_HASH:=ca4c07775185b873da572d973b9bbce86198d41d921a8d32b990da34e5ffd65d PKG_MAINTAINER:=Matti Laakso PKG_LICENSE:=GPL-2.0 From a70555fb4f9b008494007e69dd520651b3da608d Mon Sep 17 00:00:00 2001 From: Goetz Goerisch Date: Sat, 24 Aug 2024 14:07:23 +0200 Subject: [PATCH 22/23] CI: update actions/labeler to v5 * Version 5 of this action updated the runtime to Node.js 20. All scripts are now run with Node.js 20 instead of Node.js 16 and are affected by any breaking changes between Node.js 16 and 20. Signed-off-by: Goetz Goerisch Link: https://github.com/openwrt/openwrt/pull/16251 Signed-off-by: Robert Marko --- .github/workflows/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 5f82b88a50..aab1a3af60 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -14,7 +14,7 @@ jobs: name: Pull Request Labeler runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v5 with: repo-token: '${{ secrets.GITHUB_TOKEN }}' From b870c16534c05ddc94149c6ff56976d8de8a353f Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 26 Aug 2024 23:29:06 +0200 Subject: [PATCH 23/23] Revert "CI: update actions/labeler to v5" This reverts commit a70555fb4f9b008494007e69dd520651b3da608d. It is breaking GH PR-s currently, so revert until fixed. Signed-off-by: Robert Marko --- .github/workflows/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index aab1a3af60..5f82b88a50 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -14,7 +14,7 @@ jobs: name: Pull Request Labeler runs-on: ubuntu-latest steps: - - uses: actions/labeler@v5 + - uses: actions/labeler@v4 with: repo-token: '${{ secrets.GITHUB_TOKEN }}'