Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-08-21 05:07:19 +08:00
commit f2683c0fe9
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
186 changed files with 2878 additions and 1610 deletions

View File

@ -75,7 +75,7 @@ JFFS2OPTS += $(MKFS_DEVTABLE_OPT)
SQUASHFS_BLOCKSIZE := $(CONFIG_TARGET_SQUASHFS_BLOCK_SIZE)k
SQUASHFSOPT := -b $(SQUASHFS_BLOCKSIZE)
SQUASHFSOPT += -p '/dev d 755 0 0' -p '/dev/console c 600 0 0 5 1'
SQUASHFSOPT += $(if $(CONFIG_SELINUX),-xattr,-no-xattrs)
SQUASHFSOPT += $(if $(CONFIG_SELINUX),-xattrs,-no-xattrs)
SQUASHFSCOMP := gzip
LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
ifeq ($(CONFIG_SQUASHFS_XZ),y)

View File

@ -0,0 +1,123 @@
From fa8f23284d4689c2a737204b337b58d966dcbd8c Mon Sep 17 00:00:00 2001
From: Sean Parkinson <sean@wolfssl.com>
Date: Fri, 20 Aug 2021 10:23:38 +1000
Subject: [PATCH] Maths x86 asm: change asm snippets to get compiling
TFM:
Use register or memory for c0, c1, c2 in SQRADD and SQRADD2.
SP:
Use register or memory for vl, vh, vo in SP_ASM_MUL_ADD,
SP_ASM_MUL_ADD2 and SP_ASM_SQR_ADD.
---
wolfcrypt/src/asm.c | 29 ++++++++++++++++++++---------
wolfcrypt/src/sp_int.c | 6 +++---
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/wolfcrypt/src/asm.c b/wolfcrypt/src/asm.c
index b7f53d073..a37e75e02 100644
--- a/wolfcrypt/src/asm.c
+++ b/wolfcrypt/src/asm.c
@@ -698,33 +698,39 @@ __asm__( \
#define SQRADD(i, j) \
__asm__( \
- "movl %6,%%eax \n\t" \
+ "movl %3,%%eax \n\t" \
"mull %%eax \n\t" \
"addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \
- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","cc");
+ :"+rm"(c0), "+rm"(c1), "+rm"(c2) \
+ : "m"(i) \
+ :"%eax","%edx","cc");
#define SQRADD2(i, j) \
__asm__( \
- "movl %6,%%eax \n\t" \
- "mull %7 \n\t" \
+ "movl %3,%%eax \n\t" \
+ "mull %4 \n\t" \
"addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \
"addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \
- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx", "cc");
+ :"+rm"(c0), "+rm"(c1), "+rm"(c2) \
+ : "m"(i), "m"(j) \
+ :"%eax","%edx", "cc");
#define SQRADDSC(i, j) \
-__asm__( \
+__asm__( \
"movl %3,%%eax \n\t" \
"mull %4 \n\t" \
"movl %%eax,%0 \n\t" \
"movl %%edx,%1 \n\t" \
"xorl %2,%2 \n\t" \
- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "g"(i), "g"(j) :"%eax","%edx","cc");
+ :"=r"(sc0), "=r"(sc1), "=r"(sc2) \
+ : "g"(i), "g"(j) \
+ :"%eax","%edx","cc");
#define SQRADDAC(i, j) \
__asm__( \
@@ -733,7 +739,9 @@ __asm__( \
"addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \
- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","cc");
+ :"=r"(sc0), "=r"(sc1), "=r"(sc2) \
+ : "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) \
+ :"%eax","%edx","cc");
#define SQRADDDB \
__asm__( \
@@ -743,7 +751,10 @@ __asm__( \
"addl %6,%0 \n\t" \
"adcl %7,%1 \n\t" \
"adcl %8,%2 \n\t" \
- :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc");
+ :"=r"(c0), "=r"(c1), "=r"(c2) \
+ : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), \
+ "r"(sc2) \
+ : "cc");
#elif defined(TFM_X86_64)
/* x86-64 optimized */
diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c
index 6070faaa9..d26702e47 100644
--- a/wolfcrypt/src/sp_int.c
+++ b/wolfcrypt/src/sp_int.c
@@ -477,7 +477,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
"addl %%eax, %[l] \n\t" \
"adcl %%edx, %[h] \n\t" \
"adcl $0 , %[o] \n\t" \
- : [l] "+r" (vl), [h] "+r" (vh), [o] "+r" (vo) \
+ : [l] "+rm" (vl), [h] "+rm" (vh), [o] "+rm" (vo) \
: [a] "r" (va), [b] "r" (vb) \
: "eax", "edx", "cc" \
)
@@ -503,7 +503,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
"addl %%eax, %[l] \n\t" \
"adcl %%edx, %[h] \n\t" \
"adcl $0 , %[o] \n\t" \
- : [l] "+r" (vl), [h] "+r" (vh), [o] "+r" (vo) \
+ : [l] "+rm" (vl), [h] "+rm" (vh), [o] "+rm" (vo) \
: [a] "r" (va), [b] "r" (vb) \
: "eax", "edx", "cc" \
)
@@ -542,7 +542,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
"addl %%eax, %[l] \n\t" \
"adcl %%edx, %[h] \n\t" \
"adcl $0 , %[o] \n\t" \
- : [l] "+r" (vl), [h] "+r" (vh), [o] "+r" (vo) \
+ : [l] "+rm" (vl), [h] "+rm" (vh), [o] "+rm" (vo) \
: [a] "m" (va) \
: "eax", "edx", "cc" \
)
--
2.31.1

View File

@ -5,9 +5,9 @@ PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/umbim.git
PKG_SOURCE_DATE:=2019-09-11
PKG_SOURCE_VERSION:=184b707ddaa0acee84d02e0ffe599cb8b67782bd
PKG_MIRROR_HASH:=482ff69144f81fafed99035840f5a24e772472f2df2f3ac0219d6de791ac5835
PKG_SOURCE_DATE:=2021-08-18
PKG_SOURCE_VERSION:=de5623104baee6e0c13c92f05c15bf4b4145c0b1
PKG_MIRROR_HASH:=2d4a75d2b53c8413521a2fd138895e327bff3f4b4d29a540342b2d2e1e009852
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=GPL-2.0

View File

@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=selinux-policy
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git
PKG_VERSION:=0.8
PKG_MIRROR_HASH:=3b58f751a21394e3aef47fd6c9fe9430fadde6427deb5c79f08478904837ec91
PKG_VERSION:=0.9
PKG_MIRROR_HASH:=f1a37a4fc104fbacde3012178fc117b473899360f26a8735156394288441d99c
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host

View File

@ -8,16 +8,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bcm27xx-userland
PKG_VERSION:=4a0a19b88b43e48c6b51b526b9378289fb712a4c
PKG_VERSION:=3fd8527eefd8790b4e8393458efc5f94eb21a615
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)?
PKG_HASH:=0f42d48095d1f680cbe8781c2e974b76bdd0507aaef64cce8b8b472ca3a09588
PKG_HASH:=7de1527d8e9bb7632f68aa083d3b79b44fa711360e3292d59e330e0591c65ebd
PKG_FLAGS:=nonshared
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENCE
CMAKE_INSTALL:=1
CMAKE_OPTIONS+=-DVMCS_INSTALL_PREFIX=/usr
@ -46,6 +48,19 @@ define Package/bcm27xx-userland/description
BCM27xx userland tools including vcgencmd and tvservice.
endef
define Package/bcm27xx-userland-dev
SECTION:=devel
CATEGORY:=Development
SUBMENU:=Libraries
DEPENDS:=@TARGET_bcm27xx +bcm27xx-userland
TITLE:=Development files of BCM27xx userland tools
endef
define Package/bcm27xx-userland-dev/description
This package contains the header and static libraries of
the BCM27xx userland tools.
endef
define Package/bcm27xx-userland/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtmerge $(1)/usr/bin
@ -61,11 +76,22 @@ endif
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/usr/lib/
ifneq ($(ARCH),aarch64)
$(INSTALL_DIR) $(1)/usr/lib/plugins
$(CP) $(PKG_INSTALL_DIR)/usr/lib/plugins/ $(1)/usr/lib/
endif
endef
define Package/bcm27xx-userland-dev/install
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ $(1)/usr/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.a $(1)/usr/lib/
endef
$(eval $(call BuildPackage,bcm27xx-userland))
$(eval $(call BuildPackage,bcm27xx-userland-dev))

View File

@ -18,9 +18,6 @@ PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam
PKG_BUILD_PARALLEL:=1
PKG_CHECK_FORMAT_SECURITY:=0
#Busybox use it's own PIE config flag and LDFLAGS are used with ld, not gcc.
PKG_ASLR_PIE:=0
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE archival/libarchive/bz/LICENSE
PKG_CPE_ID:=cpe:/a:busybox:busybox

View File

@ -12,7 +12,6 @@
led-failsafe = &led_power_orange;
led-running = &led_power_green;
led-upgrade = &led_power_orange;
label-mac-device = &eth0;
};
extosc: ref {
@ -153,7 +152,7 @@
ath9k0: wifi@0,11 {
compatible = "pci168c,0029";
reg = <0x8800 0 0 0 0>;
mtd-mac-address = <&art 0xc>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;
@ -181,7 +180,7 @@
ath9k1: wifi@0,12 {
compatible = "pci168c,0029";
reg = <0x9000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;
@ -209,8 +208,6 @@
pll-data = <0x11110000 0x00001099 0x00991099>;
mtd-mac-address = <&art 0x00>;
fixed-link {
speed = <1000>;
full-duplex;
@ -222,7 +219,5 @@
pll-data = <0x11110000 0x00001099 0x00991099>;
mtd-mac-address = <&art 0x06>;
phy-handle = <&phy4>;
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wndr3700-v2", "qca,ar7161";
model = "Netgear WNDR3700 v2";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -33,3 +37,41 @@
read-only;
};
};
&ath9k0 {
nvmem-cells = <&macaddr_art_c>;
nvmem-cell-names = "mac-address";
};
&ath9k1 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wndr3700", "qca,ar7161";
model = "Netgear WNDR3700";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -34,7 +38,15 @@
};
};
&ath9k0 {
nvmem-cells = <&macaddr_art_c>;
nvmem-cell-names = "mac-address";
};
&ath9k1 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
/* The original WNDR3700(v1) variant have four antennae dedicated
* to the 5GHz radio as well. Again, two antennae are available for
* each chain to switch between. The following configuration is the
@ -54,3 +66,31 @@
output-high;
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wndr3800", "qca,ar7161";
model = "Netgear WNDR3800";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -34,3 +38,41 @@
read-only;
};
};
&ath9k0 {
nvmem-cells = <&macaddr_art_c>;
nvmem-cell-names = "mac-address";
};
&ath9k1 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wndr3800ch", "qca,ar7161";
model = "Netgear WNDR3800CH";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -35,3 +39,40 @@
};
};
&ath9k0 {
nvmem-cells = <&macaddr_art_c>;
nvmem-cell-names = "mac-address";
};
&ath9k1 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wndrmac-v1", "qca,ar7161";
model = "Netgear WNDRMAC v1";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -33,3 +37,41 @@
read-only;
};
};
&ath9k0 {
nvmem-cells = <&macaddr_art_c>;
nvmem-cell-names = "mac-address";
};
&ath9k1 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wndrmac-v2", "qca,ar7161";
model = "Netgear WNDRMAC v2";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -34,3 +38,41 @@
read-only;
};
};
&ath9k0 {
nvmem-cells = <&macaddr_art_c>;
nvmem-cell-names = "mac-address";
};
&ath9k1 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -21,13 +21,3 @@
&ath9k {
compatible = "pci168c,002a";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -44,13 +44,3 @@
&ath9k {
compatible = "pci168c,002b";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wnr2200-16m", "qca,ar7241";
model = "Netgear WNR2200 (16M)";
aliases {
label-mac-device = &eth1;
};
};
&partitions {
@ -33,3 +37,33 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&ath9k {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "netgear,wnr2200-8m", "qca,ar7241";
model = "Netgear WNR2200 (8M)";
aliases {
label-mac-device = &eth1;
};
};
&partitions {
@ -33,3 +37,33 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&ath9k {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
};

View File

@ -16,7 +16,6 @@
led-failsafe = &led_power_amber;
led-running = &led_power_green;
led-upgrade = &led_power_amber;
label-mac-device = &eth1;
};
ath9k-keys {
@ -154,14 +153,10 @@
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
};
&eth1 {
compatible = "qca,ar7241-eth", "syscon", "simple-mfd";
mtd-mac-address = <&art 0x6>;
};
&pcie {
@ -170,8 +165,6 @@
ath9k: wifi@0,0 {
compatible = "pci168c,002e";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;

View File

@ -91,6 +91,11 @@
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
status = "okay";
@ -107,6 +112,10 @@
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};

View File

@ -80,6 +80,21 @@
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
compatible = "syscon", "simple-mfd";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -42,6 +42,4 @@
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
};

View File

@ -169,7 +169,6 @@
full-duplex;
};
};
};
};
};
@ -177,12 +176,13 @@
&eth0 {
status = "okay";
phy-handle = <&phy0>;
phy-mode = "rgmii-rxid";
pll-data = <0x16000000 0x00000101 0x00001313>;
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
phy-handle = <&phy0>;
fixed-link {
speed = <1000>;
full-duplex;

View File

@ -5,6 +5,10 @@
/ {
model = "GL.iNet 6408";
compatible = "glinet,6408", "qca,ar9331";
aliases {
label-mac-device = &wmac;
};
};
&spi {
@ -40,3 +44,30 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
model = "GL.iNet 6416";
compatible = "glinet,6416", "qca,ar9331";
aliases {
label-mac-device = &wmac;
};
};
&spi {
@ -40,3 +44,30 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -6,10 +6,6 @@
#include <dt-bindings/input/input.h>
/ {
aliases {
label-mac-device = &wmac;
};
keys {
compatible = "gpio-keys";
@ -48,8 +44,6 @@
&eth0 {
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
device = <&gmac>;
@ -60,8 +54,6 @@
&eth1 {
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
};
&usb {
@ -76,7 +68,4 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&uboot 0x1fc00>;
};

View File

@ -2,6 +2,12 @@
#include "ar9331_tplink_tl-wr710n.dtsi"
/ {
aliases {
label-mac-device = &eth0;
};
};
&spi {
status = "okay";
@ -35,3 +41,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -11,7 +11,6 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth0;
};
keys {
@ -47,8 +46,6 @@
&eth0 {
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
device = <&gmac>;
@ -59,9 +56,6 @@
&eth1 {
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
};
&usb {
@ -77,7 +71,4 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&uboot 0x1fc00>;
};

View File

@ -11,7 +11,6 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
label-mac-device = &wmac;
};
leds: leds {
@ -80,14 +79,9 @@
status = "okay";
phy-handle = <&swphy0>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
};
&eth1 {
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
device = <&gmac>;
switch-phy-swap = <1>;
@ -96,7 +90,4 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&uboot 0x1fc00>;
};

View File

@ -6,6 +6,10 @@
model = "TP-Link TL-MR3420 v2";
compatible = "tplink,tl-mr3420-v2", "qca,ar9341";
aliases {
label-mac-device = &wmac;
};
keys {
compatible = "gpio-keys";
@ -91,3 +95,31 @@
&usb_phy {
status = "okay";
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -6,6 +6,10 @@
model = "TP-Link TL-WR841N/ND v8";
compatible = "tplink,tl-wr841-v8", "qca,ar9341";
aliases {
label-mac-device = &wmac;
};
keys {
compatible = "gpio-keys";
@ -59,3 +63,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -6,6 +6,10 @@
model = "TP-Link TL-WR842N/ND v2";
compatible = "tplink,tl-wr842n-v2", "qca,ar9341";
aliases {
label-mac-device = &wmac;
};
keys {
compatible = "gpio-keys";
@ -93,6 +97,32 @@
status = "okay";
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&eth1 {
phy-handle = <&swphy4>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -81,3 +81,13 @@
qca,disable-5ghz;
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -30,13 +30,3 @@
rxdv-delay = <3>;
};
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -38,13 +38,3 @@
rxdv-delay = <2>;
};
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -192,13 +192,3 @@
pinctrl-single,bits = <0x0 0x002e0000 0x00ff0000>;
};
};
&config {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -188,13 +188,3 @@
<0x14 0x08 0xff>;
};
};
&config {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -54,13 +54,3 @@
switch-only-mode = <1>;
};
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -88,7 +88,7 @@
reg = <0>;
spi-max-frequency = <25000000>;
nor_partitions: partitions {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
@ -123,13 +123,16 @@
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
phy-handle = <&swphy4>;
};
&eth1 {
mtd-mac-address = <&art 0x0>;
mtd-mac-address-increment = <1>;
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&wmac {
@ -137,3 +140,13 @@
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -47,3 +47,31 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
};

View File

@ -47,3 +47,31 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
};

View File

@ -97,14 +97,10 @@
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
phy-handle = <&swphy4>;
};
&eth1 {
mtd-mac-address = <&art 0x6>;
gmac-config {
device = <&gmac>;
};
@ -112,8 +108,6 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};
&usb0 {

View File

@ -29,13 +29,3 @@
switch-only-mode = <1>;
};
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -46,3 +46,38 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_art_18>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_18: macaddr@18 {
reg = <0x18 0x6>;
};
};

View File

@ -46,3 +46,38 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_art_0>;
nvmem-cell-names = "mac-address";
};
&eth1 {
nvmem-cells = <&macaddr_art_6>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_art_18>;
nvmem-cell-names = "mac-address";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_18: macaddr@18 {
reg = <0x18 0x6>;
};
};

View File

@ -84,7 +84,7 @@
status = "okay";
pll-data = <0xa6000000 0x00000101 0x00001616>;
mtd-mac-address = <&art 0x0>;
fixed-link {
speed = <1000>;
full-duplex;
@ -95,7 +95,7 @@
status = "okay";
pll-data = <0x03000101 0x00000101 0x00001616>;
mtd-mac-address = <&art 0x6>;
fixed-link {
speed = <1000>;
full-duplex;
@ -104,9 +104,6 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x18>;
};
// This node is required for the Ethernet ports to work correctly.

View File

@ -67,13 +67,3 @@
qca955x-sgmii-fixup;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -102,13 +102,3 @@
qca955x-sgmii-fixup;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -24,13 +24,3 @@
mac-address-increment = <16>;
};
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -24,13 +24,3 @@
mac-address-increment = <16>;
};
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -11,7 +11,6 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth1;
};
leds: leds {
@ -149,8 +148,6 @@
&eth0 {
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
phy-handle = <&phy0>;
pll-data = <0x56000000 0x00000101 0x00001616>;
@ -163,7 +160,6 @@
&eth1 {
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
pll-data = <0x03000101 0x00000101 0x00001616>;
fixed-link {
@ -174,7 +170,4 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&uboot 0x1fc00>;
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c5-v1", "qca,qca9558";
model = "TP-Link Archer C5 v1";
aliases {
label-mac-device = &eth1;
};
};
&keys {
@ -43,3 +47,31 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c7-v1", "qca,qca9558";
model = "TP-Link Archer C7 v1";
aliases {
label-mac-device = &eth1;
};
};
&keys {
@ -43,3 +47,31 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c7-v2", "qca,qca9558";
model = "TP-Link Archer C7 v2";
aliases {
label-mac-device = &eth1;
};
};
&keys {
@ -43,3 +47,31 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,tl-wdr7500-v3", "qca,qca9558";
model = "TP-Link TL-WDR7500 v3";
aliases {
label-mac-device = &eth1;
};
};
&keys {
@ -43,3 +47,31 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c58-v1", "qca,qca9560";
model = "TP-Link Archer C58 v1";
aliases {
label-mac-device = &eth1;
};
};
&spi {
@ -52,3 +56,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c59-v1", "qca,qca9560";
model = "TP-Link Archer C59 v1";
aliases {
label-mac-device = &eth1;
};
};
&leds {
@ -76,3 +80,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c59-v2", "qca,qca9560";
model = "TP-Link Archer C59 v2";
aliases {
label-mac-device = &eth1;
};
};
&leds {
@ -82,3 +86,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -13,7 +13,6 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
label-mac-device = &eth1;
};
led_spi {
@ -126,9 +125,6 @@
phy-handle = <&swphy0>;
mtd-mac-address = <&info 0x8>;
mac-address-increment = <1>;
gmac-config {
device = <&gmac>;
@ -139,13 +135,8 @@
&eth1 {
status = "okay";
mtd-mac-address = <&info 0x8>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>;
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c60-v1", "qca,qca9561";
model = "TP-Link Archer C60 v1";
aliases {
label-mac-device = &eth1;
};
};
&leds {
@ -64,3 +68,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c60-v2", "qca,qca9561";
model = "TP-Link Archer C60 v2";
aliases {
label-mac-device = &eth1;
};
};
&leds {
@ -70,3 +74,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c60-v3", "qca,qca9561";
model = "TP-Link Archer C60 v3";
aliases {
label-mac-device = &eth1;
};
};
&leds {
@ -13,6 +17,7 @@
gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
};
};
&spi {
status = "okay";
@ -64,3 +69,31 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&eth1 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -11,7 +11,6 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
label-mac-device = &eth1;
};
keys {
@ -71,20 +70,12 @@
status = "okay";
phy-handle = <&swphy4>;
mtd-mac-address = <&info 0x8>;
mac-address-increment = <1>;
};
&eth1 {
status = "okay";
mtd-mac-address = <&info 0x8>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>;
};

View File

@ -50,3 +50,23 @@
&pcie {
status = "okay";
};
&eth0 {
nvmem-cells = <&macaddr_art_1002>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&wmac {
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};

View File

@ -40,3 +40,23 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_art_1002>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&wmac {
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};

View File

@ -105,13 +105,10 @@
pll-data = <0x03000101 0x00000101 0x00001919>;
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <(-1)>;
phy-mode = "sgmii";
phy-handle = <&phy0>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-a7-v5", "qca,qca9563";
model = "TP-Link Archer A7 v5";
aliases {
label-mac-device = &eth0;
};
};
&keys {
@ -59,3 +63,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -7,6 +7,8 @@
model = "TP-Link Archer C6 v2 (US) / A6 v2 (US/TW)";
aliases {
label-mac-device = &eth0;
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
@ -125,3 +127,25 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -7,6 +7,8 @@
model = "TP-Link Archer C6 v2 (EU/RU/JP)";
aliases {
label-mac-device = &eth0;
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
@ -119,3 +121,25 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,archer-c7-v5", "qca,qca9563";
model = "TP-Link Archer C7 v5";
aliases {
label-mac-device = &eth0;
};
};
&keys {
@ -65,3 +69,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -5,12 +5,6 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
aliases {
label-mac-device = &eth0;
};
};
&pcie {
status = "okay";
};
@ -37,13 +31,8 @@
phy-mode = "sgmii";
phy-handle = <&phy0>;
mtd-mac-address = <&info 0x8>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>;
};

View File

@ -11,7 +11,6 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &eth0;
};
leds {
@ -162,13 +161,9 @@
pll-data = <0x03000101 0x00000101 0x00001919>;
phy-mode = "sgmii";
mtd-mac-address = <&info 0x8>;
phy-handle = <&phy0>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>;
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,re450-v2", "qca,qca9563";
model = "TP-Link RE450 v2";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -44,3 +48,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,re450-v3", "qca,qca9563";
model = "TP-Link RE450 v3";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -50,3 +54,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -7,7 +7,6 @@
/ {
aliases {
label-mac-device = &eth0;
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
@ -129,13 +128,8 @@
phy-mode = "sgmii";
phy-handle = <&phy4>;
mtd-mac-address = <&info 0x8>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>;
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,re455-v1", "qca,qca9563";
model = "TP-Link RE455 v1";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
@ -50,3 +54,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -43,6 +43,8 @@
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_uboot_fc00>;
nvmem-cell-names = "mac-address";
};

View File

@ -128,6 +128,4 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};

View File

@ -1,13 +1,35 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9563_tplink_tl-wpa8630p-v2.dtsi"
#include "qca9563_tplink_tl-wpa8630.dtsi"
/ {
compatible = "tplink,tl-wpa8630p-v2-int", "qca,qca9563";
model = "TP-Link WPA8630P v2 (Int.)";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
partition@0 {
label = "factory-uboot";
reg = <0x000000 0x020000>;
read-only;
};
partition@20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
};
partition@40000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x040000 0x5e0000>;
};
partition@620000 {
label = "partition-table";
reg = <0x620000 0x010000>;
@ -32,3 +54,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -1,13 +1,35 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9563_tplink_tl-wpa8630p-v2.dtsi"
#include "qca9563_tplink_tl-wpa8630.dtsi"
/ {
compatible = "tplink,tl-wpa8630p-v2.0-eu", "qca,qca9563";
model = "TP-Link WPA8630P v2.0 (EU)";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
partition@0 {
label = "factory-uboot";
reg = <0x000000 0x020000>;
read-only;
};
partition@20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
};
partition@40000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x040000 0x5e0000>;
};
partition@620000 {
label = "partition-table";
reg = <0x620000 0x010000>;
@ -32,3 +54,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -1,13 +1,35 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9563_tplink_tl-wpa8630p-v2.dtsi"
#include "qca9563_tplink_tl-wpa8630.dtsi"
/ {
compatible = "tplink,tl-wpa8630p-v2.1-eu", "qca,qca9563";
model = "TP-Link WPA8630P v2.1 (EU)";
aliases {
label-mac-device = &eth0;
};
};
&partitions {
partition@0 {
label = "factory-uboot";
reg = <0x000000 0x020000>;
read-only;
};
partition@20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
};
partition@40000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x040000 0x5e0000>;
};
/* 0x620000 to 0x680000 is empty in OEM partitioning */
partition@680000 {
@ -28,3 +50,25 @@
read-only;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -1,37 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9563_tplink_tl-wpa8630.dtsi"
/ {
aliases {
label-mac-device = &eth0;
};
};
&partitions {
partition@0 {
label = "factory-uboot";
reg = <0x000000 0x020000>;
read-only;
};
partition@20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
};
partition@40000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x040000 0x5e0000>;
};
};
&eth0 {
mtd-mac-address = <&info 0x8>;
};
&wmac {
mtd-mac-address = <&info 0x8>;
};

View File

@ -5,6 +5,10 @@
/ {
compatible = "tplink,tl-wr1043n-v5", "qca,qca9563";
model = "TP-Link TL-WR1043N v5";
aliases {
label-mac-device = &wmac;
};
};
&spi {
@ -70,3 +74,25 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -11,7 +11,6 @@
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
label-mac-device = &wmac;
};
leds: leds {
@ -103,14 +102,10 @@
&eth0 {
status = "okay";
mtd-mac-address = <&info 0x8>;
phy-mode = "sgmii";
phy-handle = <&phy0>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>;
};

View File

@ -6,6 +6,10 @@
compatible = "tplink,tl-wr1043nd-v4", "qca,qca9563";
model = "TP-Link TL-WR1043ND v4";
aliases {
label-mac-device = &wmac;
};
gpio-export {
compatible = "gpio-export";
#size-cells = <0>;
@ -99,3 +103,25 @@
#trigger-source-cells = <0>;
};
};
&eth0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&wmac {
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -28,13 +28,3 @@
pll-data = <0x03000000 0x00000101 0x00001313>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -29,13 +29,3 @@
nvmem-cell-names = "mac-address";
phy-handle = <&phy0>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -105,3 +105,13 @@
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
};

View File

@ -67,13 +67,3 @@
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -69,13 +69,3 @@
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -33,13 +33,3 @@
nvmem-cells = <&macaddr_uboot_1fc00>;
nvmem-cell-names = "mac-address";
};
&uboot {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_1fc00: macaddr@1fc00 {
reg = <0x1fc00 0x6>;
};
};

View File

@ -365,6 +365,7 @@ define Device/edgecore_ecw5211
SOC := qcom-ipq4018
BLOCKSIZE := 128k
PAGESIZE := 2048
DEVICE_DTS_CONFIG := config@ap.dk01.1-c2
DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm
endef
TARGET_DEVICES += edgecore_ecw5211

View File

@ -51,3 +51,19 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_urlader_a91>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
};
&urlader {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_urlader_a91: macaddr@a91 {
reg = <0xa91 0x6>;
};
};

View File

@ -51,3 +51,19 @@
};
};
};
&eth0 {
nvmem-cells = <&macaddr_urlader_a91>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
};
&urlader {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_urlader_a91: macaddr@a91 {
reg = <0xa91 0x6>;
};
};

View File

@ -83,3 +83,19 @@
#address-cells = <2>;
};
};
&eth0 {
nvmem-cells = <&macaddr_urlader_a91>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
};
&urlader {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_urlader_a91: macaddr@a91 {
reg = <0xa91 0x6>;
};
};

View File

@ -80,11 +80,6 @@
};
};
&eth0 {
mtd-mac-address = <&urlader 0xa91>;
mac-address-increment = <(-2)>;
};
&gphy0 {
lantiq,gphy-mode = <GPHY_MODE_GE>;
};

View File

@ -8,23 +8,28 @@
};
gpio-keys {
@@ -69,6 +70,7 @@
gmac0: mac@0 {
@@ -70,6 +71,10 @@
compatible = "mediatek,eth-mac";
reg = <0>;
+ mtd-mac-address = <&factory 0x2a>;
phy-mode = "2500base-x";
+
+ nvmem-cells = <&macaddr_factory_2a>;
+ nvmem-cell-names = "mac-address";
+
fixed-link {
speed = <2500>;
@@ -80,6 +82,7 @@
gmac1: mac@1 {
compatible = "mediatek,eth-mac";
full-duplex;
@@ -82,6 +87,9 @@
reg = <1>;
+ mtd-mac-address = <&factory 0x24>;
phy-mode = "gmii";
phy-handle = <&phy0>;
+
+ nvmem-cells = <&macaddr_factory_24>;
+ nvmem-cell-names = "mac-address";
};
@@ -133,8 +136,9 @@
mdio: mdio-bus {
@@ -133,8 +141,9 @@
};
partition@b0000 {
@ -35,3 +40,21 @@
};
};
};
@@ -272,3 +281,17 @@
pinctrl-0 = <&watchdog_pins>;
status = "okay";
};
+
+&factory {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_factory_24: macaddr@24 {
+ reg = <0x24 0x6>;
+ };
+
+ macaddr_factory_2a: macaddr@2a {
+ reg = <0x2a 0x6>;
+ };
+};

View File

@ -42,7 +42,7 @@ Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com>
"mediatek,mt7622-spi";
--- a/arch/arm/boot/dts/mt7629-rfb.dts
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
@@ -249,6 +249,52 @@
@@ -254,6 +254,52 @@
};
};

View File

@ -135,7 +135,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
--- a/arch/arm/boot/dts/mt7629-rfb.dts
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
@@ -144,9 +144,10 @@
@@ -149,9 +149,10 @@
};
};

View File

@ -22,27 +22,31 @@
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000>;
@@ -69,6 +77,7 @@
gmac0: mac@0 {
@@ -70,6 +78,10 @@
compatible = "mediatek,eth-mac";
reg = <0>;
+ mtd-mac-address = <&factory 0x2a>;
phy-mode = "2500base-x";
+
+ nvmem-cells = <&macaddr_factory_2a>;
+ nvmem-cell-names = "mac-address";
+
fixed-link {
speed = <2500>;
@@ -80,6 +89,7 @@
gmac1: mac@1 {
compatible = "mediatek,eth-mac";
full-duplex;
@@ -82,6 +94,9 @@
reg = <1>;
+ mtd-mac-address = <&factory 0x24>;
phy-mode = "gmii";
phy-handle = <&phy0>;
+
+ nvmem-cells = <&macaddr_factory_24>;
+ nvmem-cell-names = "mac-address";
};
@@ -93,6 +103,26 @@
};
mdio: mdio-bus {
@@ -94,6 +109,26 @@
};
};
+
+&gsw {
+ mediatek,mdio = <&mdio>;
+ mediatek,portmap = "llllw";
@ -62,6 +66,25 @@
+ };
+ };
+};
+
&i2c {
pinctrl-names = "default";
pinctrl-0 = <&i2c_pins>;
@@ -272,3 +307,17 @@
pinctrl-0 = <&watchdog_pins>;
status = "okay";
};
+
+&factory {
+ compatible = "nvmem-cells";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_factory_24: macaddr@24 {
+ reg = <0x24 0x6>;
+ };
+
+ macaddr_factory_2a: macaddr@2a {
+ reg = <0x2a 0x6>;
+ };
+};

View File

@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/mt7629-rfb.dts
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
@@ -163,8 +163,9 @@
@@ -168,8 +168,9 @@
};
partition@b0000 {

Some files were not shown because too many files have changed in this diff Show More