fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-08-27 18:11:32 +08:00
commit c260ee4f15
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
97 changed files with 840 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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> "

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

@ -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> "

4
package/boot/uboot-lantiq/Makefile
View File

@ -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

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

@ -1,7 +1,7 @@
From 3f7be04a148d23cdb5fd320e0e2923983f8bd1f4 Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
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 <luka@openwrt.org>
@ -51,7 +51,7 @@ Signed-off-by: Luka Perkov <luka@openwrt.org>
+/*
+ * Copyright (C) 2013 Luka Perkov <luka@openwrt.org>
+ *
+ * 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 <luka@openwrt.org>
+
+#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 */

29
package/boot/uboot-rockchip/patches/010-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch Normal file
View File

@ -0,0 +1,29 @@
From 626a479873b6a680b3227c4852bde4a1f2c17fdf Mon Sep 17 00:00:00 2001
From: Chukun Pan <amadeus@jmu.edu.cn>
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 <naoki@radxa.com>
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/20240419103019.992586-3-amadeus@jmu.edu.cn
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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 {

43
package/boot/uboot-rockchip/patches/011-arm64-dts-rockchip-Correct-the-model-names-for-Radxa.patch Normal file
View File

@ -0,0 +1,43 @@
From 45e831033f7a00a14f64afa1e34c476a9ff0f9f0 Mon Sep 17 00:00:00 2001
From: Dragan Simic <dsimic@manjaro.org>
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 <naoki@radxa.com>
Signed-off-by: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/6931289a252dc2d6c7bfd2388835c5e98ba0d8c9.1713457260.git.dsimic@manjaro.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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 {

11
package/devel/trace-cmd/Makefile
View File

@ -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/

27
package/firmware/linux-firmware/intel.mk
View File

@ -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))

25
package/kernel/mt76/Makefile
View File

@ -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 <nbd@nbd.name>
PKG_USE_NINJA:=0
@ -332,6 +332,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
@ -345,7 +351,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
@ -353,7 +359,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
@ -619,6 +625,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 \
@ -669,6 +683,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))

2
package/kernel/mt7621-qtn-rgmii/Makefile
View File

@ -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)

6
package/libs/ustream-ssl/Makefile
View File

@ -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

2
package/network/services/dnsmasq/Makefile
View File

@ -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/

3
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -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

6
package/network/utils/uqmi/Makefile
View File

@ -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 <malaakso@elisanet.fi>
PKG_LICENSE:=GPL-2.0

4
package/utils/zyxel-bootconfig/Makefile
View File

@ -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 <mail@david-bauer.net>
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

2
target/linux/armsr/base-files/etc/inittab
View File

@ -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

1
target/linux/armsr/image/Makefile
View File

@ -12,6 +12,7 @@ GRUB_TERMINAL_CONFIG =
GRUB_CONSOLE_CMDLINE = earlycon
ifneq ($(CONFIG_GRUB_CONSOLE),)
GRUB_CONSOLE_CMDLINE += console=tty1
GRUB_TERMINALS += console
endif

17
target/linux/ath79/dts/qca9558_sophos_ap15.dts → target/linux/ath79/dts/qca9557_sophos_ap15.dts
View File

@ -7,7 +7,7 @@
#include <dt-bindings/leds/common.h>
/ {
compatible = "sophos,ap15", "qca,qca9558";
compatible = "sophos,ap15", "qca,qca9557";
model = "Sophos AP15";
aliases {
@ -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>;
};
};
};

2
target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
View File

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

2
target/linux/ath79/dts/qca9558_zyxel_emg2926_q10a.dts
View File

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

2
target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
View File

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

7
target/linux/ath79/image/generic.mk
View File

@ -2917,10 +2917,9 @@ endef
TARGET_DEVICES += sitecom_wlr-8100
define Device/sophos_ap15
SOC := qca9558
SOC := qca9557
DEVICE_VENDOR := Sophos
DEVICE_MODEL := AP15
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
IMAGE_SIZE := 15936k
endef
TARGET_DEVICES += sophos_ap15
@ -3268,7 +3267,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
@ -3315,7 +3314,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

2
target/linux/ath79/image/nand.mk
View File

@ -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

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

@ -1541,7 +1541,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+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:

3
target/linux/bmips/bcm6318/base-files/etc/board.d/01_leds
View File

@ -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

3
target/linux/bmips/bcm6318/base-files/etc/board.d/02_network
View File

@ -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"
;;

3
target/linux/bmips/bcm6318/base-files/etc/uci-defaults/09_fix_crc
View File

@ -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

253
target/linux/bmips/dts/bcm6318-tp-link-td-w8968-v3.dts Normal file
View File

@ -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 = <KEY_WLAN>;
debounce-interval = <60>;
};
wps {
label = "wps";
gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
debounce-interval = <60>;
};
reset {
label = "reset";
gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
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";
};
&ethernet {
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_COLOR_ID_GREEN>;
};
led_power_green: led@3 {
reg = <3>;
active-high;
function = LED_FUNCTION_POWER;
color = <LED_COLOR_ID_GREEN>;
};
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_COLOR_ID_GREEN>;
};
led@10 {
reg = <10>;
active-low;
label = "green:dsl";
};
led@13 {
reg = <13>;
active-low;
function = LED_FUNCTION_USB;
color = <LED_COLOR_ID_GREEN>;
};
led@16 {
reg = <16>;
active-low;
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
};
};
&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";
};

20
target/linux/bmips/image/bcm6318.mk
View File

@ -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

42
target/linux/generic/backport-6.6/781-12-v6.11-net-phy-realtek-Fix-setting-of-PHY-LEDs-Mode-B-bit-o.patch Normal file
View File

@ -0,0 +1,42 @@
From a2f5c505b4378cd6fc7c4a44ff3665ccef2037db Mon Sep 17 00:00:00 2001
From: Sava Jakovljev <savaj@meyersound.com>
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 <savaj@meyersound.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Link: https://patch.msgid.link/PAWP192MB21287372F30C4E55B6DF6158C38E2@PAWP192MB2128.EURP192.PROD.OUTLOOK.COM
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
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);
}

16
target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch → target/linux/generic/pending-6.6/720-01-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- 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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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)",

4
target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch → target/linux/generic/pending-6.6/720-02-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- 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 <daniel@makrotopia.org>
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;

2
target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch → target/linux/generic/pending-6.6/720-03-net-phy-realtek-make-sure-paged-read-is-protected-by.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- 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;

2
target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch → target/linux/generic/pending-6.6/720-04-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- 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 |

2
target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch → target/linux/generic/pending-6.6/720-05-net-phy-realtek-check-validity-of-10GbE-link-partner.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- 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;

14
target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch → target/linux/generic/pending-6.6/720-06-net-phy-realtek-introduce-rtl822x_probe.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#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 <daniel@makrotopia.org>
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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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 <daniel@makrotopia.org>
.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)",

2
target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch → target/linux/generic/pending-6.6/720-07-net-phy-realtek-detect-early-version-of-RTL8221B.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
--- 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)
{

10
target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch → target/linux/generic/pending-6.6/720-08-net-phy-realtek-support-interrupt-of-RTL8221B.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
--- 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 <zhaojh329@gmail.com>
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 <zhaojh329@gmail.com>
.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 <zhaojh329@gmail.com>
.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 <zhaojh329@gmail.com>
.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)",

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

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

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

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

6
target/linux/ipq40xx/image/generic.mk
View File

@ -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

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

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

6
target/linux/ipq806x/image/generic.mk
View File

@ -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)
@ -614,7 +614,7 @@ TARGET_DEVICES += xiaomi_mi-router-hd
define Device/zyxel_nbg6817
$(Device/dsa-migration)
DEVICE_VENDOR := ZyXEL
DEVICE_VENDOR := Zyxel
DEVICE_MODEL := NBG6817
SOC := qcom-ipq8065
KERNEL_SIZE := 4096k
@ -626,6 +626,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

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

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

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

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

6
target/linux/kirkwood/image/Makefile
View File

@ -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 \

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

@ -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";

3
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
View File

@ -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>;

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

@ -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 {

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

@ -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 {

2
target/linux/lantiq/image/ar9.mk
View File

@ -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

4
target/linux/lantiq/image/vr9.mk
View File

@ -371,7 +371,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
@ -385,7 +385,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

4
target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
View File

@ -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)

1
target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface
View File

@ -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)

209
target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts Normal file
View File

@ -0,0 +1,209 @@
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
/dts-v1/;
#include <dt-bindings/leds/common.h>
#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 = <KEY_RESTART>;
gpios = <&pio 1 GPIO_ACTIVE_LOW>;
};
wps {
label = "wps";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&pio 0 GPIO_ACTIVE_LOW>;
};
};
leds {
compatible = "gpio-leds";
led_status_green: led@0 {
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_GREEN>;
gpios = <&pio 10 GPIO_ACTIVE_HIGH>;
};
led_status_red: led_1 {
function = LED_FUNCTION_POWER;
color = <LED_COLOR_ID_RED>;
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";
};
&eth {
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";
};

2
target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
View File

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

2
target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
View File

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

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

@ -95,6 +95,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|\

1
target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
View File

@ -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)

21
target/linux/mediatek/image/filogic.mk
View File

@ -557,6 +557,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
@ -1606,7 +1623,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
@ -1621,7 +1638,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

2
target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
View File

@ -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;

2
target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts
View File

@ -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;

2
target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts
View File

@ -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;

2
target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts
View File

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

2
target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts
View File

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

2
target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts
View File

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

2
target/linux/ramips/dts/mt7621_zyxel_nr7101.dts
View File

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

2
target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts
View File

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

2
target/linux/ramips/dts/mt7621_zyxel_nwa55axe.dts
View File

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

2
target/linux/ramips/dts/mt7621_zyxel_wap6805.dts
View File

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

2
target/linux/ramips/dts/mt7621_zyxel_wsm20.dts
View File

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

2
target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
View File

@ -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;

2
target/linux/ramips/dts/rt3052_zyxel_keenetic.dts
View File

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

2
target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts
View File

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

2
target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts
View File

@ -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;

2
target/linux/ramips/dts/rt5350_zyxel_keenetic-4g-b.dts
View File

@ -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;

2
target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts
View File

@ -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;

2
target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts
View File

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

2
target/linux/ramips/files/drivers/mtd/nand/raw/mt7621_nand.c
View File

@ -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,
},
};

8
target/linux/ramips/image/mt7620.mk
View File

@ -1586,7 +1586,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
@ -1598,7 +1598,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
@ -1611,7 +1611,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
@ -1624,7 +1624,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

12
target/linux/ramips/image/mt7621.mk
View File

@ -3291,7 +3291,7 @@ TARGET_DEVICES += zte_e8820s
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 \
@ -3306,7 +3306,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 \
@ -3321,7 +3321,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
@ -3333,7 +3333,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
@ -3358,7 +3358,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
@ -3369,7 +3369,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

2
target/linux/ramips/image/mt76x8.mk
View File

@ -1157,7 +1157,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

12
target/linux/ramips/image/rt305x.mk
View File

@ -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

2
target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-10hp.dts
View File

@ -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 {

2
target/linux/realtek/dts-5.15/rtl8380_zyxel_gs1900-8.dts
View File

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

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

@ -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 {

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

@ -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 {

2
target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-16.dts
View File

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

2
target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24-v1.dts
View File

@ -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>;

2
target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24e.dts
View File

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

2
target/linux/realtek/dts-5.15/rtl8382_zyxel_gs1900-24ep.dts
View File

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

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

@ -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>;

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

@ -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 {

2
target/linux/realtek/image/common.mk
View File

@ -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 := \

2
target/linux/realtek/image/rtl838x.mk
View File

@ -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

29
target/linux/rockchip/patches-6.6/008-v6.10-arm64-dts-rockchip-correct-the-model-name-for-Radxa-.patch Normal file
View File

@ -0,0 +1,29 @@
From 626a479873b6a680b3227c4852bde4a1f2c17fdf Mon Sep 17 00:00:00 2001
From: Chukun Pan <amadeus@jmu.edu.cn>
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 <naoki@radxa.com>
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/20240419103019.992586-3-amadeus@jmu.edu.cn
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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 {

2
target/linux/x86/image/Makefile
View File

@ -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