Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-11-22 13:50:28 +08:00
commit 058fdbf592
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
83 changed files with 955 additions and 911 deletions

View File

@ -11,9 +11,9 @@ PKG_NAME:=udebug
CMAKE_INSTALL:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/udebug.git
PKG_MIRROR_HASH:=3447dc6edd1b76f7ea5b9650a2aedcab69aba6048fa5ab7b1732cad592651fbc
PKG_SOURCE_DATE:=2023-11-19
PKG_SOURCE_VERSION:=44351435e28c6c878bf0a9054cb002704312d60e
PKG_MIRROR_HASH:=baf437fb12b1faaf6c7eea3fea253c6d87c31b85f768b48d3984fe398e5b20b8
PKG_SOURCE_DATE:=2023-11-20
PKG_SOURCE_VERSION:=759d9404034b7da97b3950c806ace7296a0f7a12
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
PKG_LICENSE:=GPL-2.0

View File

@ -1,4 +1,8 @@
config service hostapd
option enabled 0
config service wpa_supplicant
option enabled 0
config service netifd
option enabled 0

View File

@ -5,9 +5,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
PKG_SOURCE_DATE:=2023-11-14
PKG_SOURCE_VERSION:=8587c074f1eb2064c42adb0a6aa5073f695ab89d
PKG_MIRROR_HASH:=f5ceb771badd7a23cceb53537299580d4b483e2b3ec5de09b9c3c54692893dd9
PKG_SOURCE_DATE:=2023-11-20
PKG_SOURCE_VERSION:=f3e06e81b347bbdec1c6c71603328b6e442728d4
PKG_MIRROR_HASH:=f16dd61aede5597fd7b5ee8e7752a916494281bc981b35c16e788ddb7409584a
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=GPL-2.0
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/netifd
SECTION:=base
CATEGORY:=Base system
DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox
DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn +libubox +libudebug
TITLE:=OpenWrt Network Interface Configuration Daemon
endef

View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=umdns
PKG_RELEASE:=5
PKG_RELEASE:=1
PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2023-10-19
PKG_SOURCE_VERSION:=d45c443aa1e6514aab58bbbf9311913e484d31a6
PKG_MIRROR_HASH:=20d91d867f4f34a37c7b2a600327884375f9f16c1ea9bbb3199347d8b617d856
PKG_SOURCE_DATE:=2023-11-21
PKG_SOURCE_VERSION:=b1e023eda3584da4a5dfbc33016839f977a02040
PKG_MIRROR_HASH:=e0619afc3b8e1b8a627b35bbe0734746303db02e6d62fd8a3ff047d4fbaa0522
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=LGPL-2.1
@ -27,7 +27,7 @@ define Package/umdns
SECTION:=net
CATEGORY:=Network
TITLE:=OpenWrt Multicast DNS Daemon
DEPENDS:=+libubox +libubus +libblobmsg-json
DEPENDS:=+libubox +libubus +libblobmsg-json +libudebug
endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include

View File

@ -19,6 +19,7 @@
"fcntl",
"fcntl64",
"fstat",
"ftruncate",
"getdents64",
"getsockname",
"getrandom",
@ -48,6 +49,7 @@
"statx",
"time",
"uname",
"unlinkat",
"write",
"writev"
],

View File

@ -3,13 +3,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=firmware-utils
PKG_RELEASE:=2
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
PKG_SOURCE_DATE:=2023-05-18
PKG_SOURCE_VERSION:=02cdbc6a4d61605c008efef09162f772f553fcde
PKG_MIRROR_HASH:=f5188fc38bb03ddbcc34763ff049597e2d8af98c0854910dc87f10e5927096e2
PKG_SOURCE_DATE:=2023-11-21
PKG_SOURCE_VERSION:=12bf1a99bd6eebae90caa144bb4d8b0cd763ff8f
PKG_MIRROR_HASH:=923508e729b4c1fcc497f18ad5fa33c62dc74b9aeac1a3f215b3291892903baf
PKG_BUILD_DEPENDS:=openssl zlib

View File

@ -187,6 +187,16 @@
label = "cferom";
reg = <0x0000000 0x0020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};
};
partition@20000 {
@ -284,13 +294,3 @@
&usbh {
status = "okay";
};
&cferom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -170,6 +170,16 @@
label = "cferom";
reg = <0x0000000 0x0020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};
};
partition@20000 {
@ -228,13 +238,3 @@
&usbh {
status = "okay";
};
&cferom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -46,9 +46,8 @@
pci-bus = <1>;
pci-dev = <0>;
nvmem-cells = <&macaddr_cferom_6a0>;
nvmem-cells = <&macaddr_cferom_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm4360-sprom.bin";
};
@ -61,7 +60,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cferom_6a0>;
nvmem-cells = <&macaddr_cferom_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -196,6 +195,18 @@
label = "cferom";
reg = <0x0000000 0x0020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
compatible = "mac-base";
reg = <0x6a0 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@20000 {
@ -309,13 +320,3 @@
&usbh {
status = "okay";
};
&cferom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -185,6 +185,16 @@
label = "cferom";
reg = <0x0000000 0x0020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};
};
partition@20000 {
@ -225,13 +235,3 @@
&usbh {
status = "okay";
};
&cferom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -38,9 +38,8 @@
pci-bus = <1>;
pci-dev = <0>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43217-sprom.bin";
brcm,sprom-fixups = <6 0x1c00>,
@ -64,7 +63,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -90,6 +89,18 @@
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 {
@ -247,13 +258,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -36,9 +36,8 @@
pci-bus = <1>;
pci-dev = <0>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43227-sprom.bin";
};
@ -51,7 +50,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -74,6 +73,18 @@
label = "cfe";
reg = <0x000000 0x010000>;
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 {
@ -174,13 +185,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -31,9 +31,8 @@
pci-bus = <1>;
pci-dev = <0>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43225-sprom.bin";
brcm,sprom-fixups = <97 0xfee5>,
@ -52,7 +51,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -78,6 +77,18 @@
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 {
@ -178,13 +189,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -31,9 +31,8 @@
pci-bus = <1>;
pci-dev = <0>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43225-sprom.bin";
brcm,sprom-fixups = <2 0x05bb>,
@ -70,7 +69,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -96,6 +95,18 @@
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 {
@ -205,13 +216,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -38,9 +38,8 @@
pci-bus = <1>;
pci-dev = <0>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43217-sprom.bin";
};
@ -53,7 +52,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -76,6 +75,18 @@
label = "cfe";
reg = <0x000000 0x010000>;
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 {
@ -204,13 +215,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -45,9 +45,8 @@
pci-bus = <1>;
pci-dev = <0>;
nvmem-cells = <&macaddr_cferom_6a0>;
nvmem-cells = <&macaddr_cferom_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43217-sprom.bin";
brcm,sprom-fixups = <6 0x1c00>,
@ -77,7 +76,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cferom_6a0>;
nvmem-cells = <&macaddr_cferom_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -192,6 +191,18 @@
label = "cferom";
reg = <0x0000000 0x0020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
compatible = "mac-base";
reg = <0x6a0 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@20000 {
@ -300,13 +311,3 @@
&usbh {
status = "okay";
};
&cferom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -134,7 +134,7 @@
&ethernet1 {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
phy-mode = "mii";
@ -162,9 +162,8 @@
qca,no-eeprom;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
#gpio-cells = <2>;
gpio-controller;
@ -183,6 +182,18 @@
label = "cfe";
reg = <0x000000 0x020000>;
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@20000 {
@ -195,6 +206,16 @@
label = "cal_data";
reg = <0xee0000 0x100000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
cal_data_1e000: cal@1e000 {
reg = <0x1e000 0xeb8>;
};
};
};
partition@fe0000 {
@ -211,23 +232,3 @@
&usbh {
status = "okay";
};
&cal_data {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_data_1e000: cal@1e000 {
reg = <0x1e000 0xeb8>;
};
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -164,6 +164,16 @@
label = "cferom";
reg = <0x0000000 0x0020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};
};
partition@20000 {
@ -224,13 +234,3 @@
&usbh {
status = "okay";
};
&cferom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -216,6 +216,16 @@
label = "cferom";
reg = <0x0000000 0x0004000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};
};
partition@4000 {
@ -298,13 +308,3 @@
&usbh {
status = "okay";
};
&cferom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cferom_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -178,6 +178,16 @@
label = "CFE";
reg = <0x000000 0x020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};
};
partition@20000 {
@ -208,13 +218,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -61,9 +61,8 @@
pci-bus = <0>;
pci-dev = <1>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43222-sprom.bin";
brcm,sprom-fixups = <97 0xfeb3>,
@ -82,7 +81,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -106,6 +105,18 @@
label = "CFE";
reg = <0x0000000 0x0020000>;
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@20000 {
@ -170,13 +181,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -61,9 +61,8 @@
pci-bus = <0>;
pci-dev = <1>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43222-sprom.bin";
brcm,sprom-fixups = <97 0xfeb3>,
@ -82,7 +81,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -106,6 +105,18 @@
label = "CFE";
reg = <0x000000 0x010000>;
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@20000 {
@ -170,13 +181,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -207,6 +207,16 @@
label = "CFE";
reg = <0x0000000 0x0020000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};
};
partition@20000 {
@ -253,13 +263,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -83,9 +83,8 @@
pci-bus = <0>;
pci-dev = <1>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm43222-sprom.bin";
brcm,sprom-fixups = <2 0x04d2>, <4 0x4350>,
@ -124,7 +123,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -157,6 +156,18 @@
label = "CFE";
reg = <0x0000000 0x0020000>;
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@20000 {
@ -221,13 +232,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -80,9 +80,8 @@
pci-bus = <0>;
pci-dev = <1>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm4322-sprom.bin";
brcm,sprom-fixups = <97 0xfeed>,
@ -101,7 +100,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -170,6 +169,18 @@
label = "CFE";
reg = <0x000000 0x010000>;
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@20000 {
@ -218,13 +229,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -88,9 +88,8 @@
pci-bus = <0>;
pci-dev = <1>;
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
brcm,sprom = "brcm/bcm4322-sprom.bin";
brcm,sprom-fixups = <219 0xec08>;
@ -104,7 +103,7 @@
&ethernet {
status = "okay";
nvmem-cells = <&macaddr_cfe_6a0>;
nvmem-cells = <&macaddr_cfe_6a0 0>;
nvmem-cell-names = "mac-address";
};
@ -189,6 +188,18 @@
label = "CFE";
reg = <0x000000 0x020000>;
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@20000 {
@ -225,13 +236,3 @@
&usbh {
status = "okay";
};
&cfe {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_cfe_6a0: macaddr@6a0 {
reg = <0x6a0 0x6>;
};
};

View File

@ -20,14 +20,12 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
--- a/net/core/of_net.c
+++ b/net/core/of_net.c
@@ -119,28 +119,63 @@ static int of_get_mac_addr_nvmem(struct
@@ -119,10 +119,19 @@ static int of_get_mac_addr_nvmem(struct
* this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
* but is all zeros.
*
+ * DT can tell the system to increment the mac-address after is extracted by
+ * using:
+ * - mac-address-increment-byte to decide what byte to increase
+ * (if not defined is increased the last byte)
+ * - mac-address-increment to decide how much to increase. The value WILL
+ * overflow to other bytes if the increment is over 255 or the total
+ * increment will exceed 255 of the current byte.
@ -38,19 +36,11 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
*/
int of_get_mac_address(struct device_node *np, u8 *addr)
{
+ u32 inc_idx, mac_inc, mac_val;
+ u32 mac_inc, mac_val;
int ret;
+ /* Check first if the increment byte is present and valid.
+ * If not set assume to increment the last byte if found.
+ */
+ if (of_property_read_u32(np, "mac-address-increment-byte", &inc_idx))
+ inc_idx = 5;
+ if (inc_idx < 3 || inc_idx > 5)
+ return -EINVAL;
+
if (!np)
return -ENODEV;
@@ -130,17 +139,33 @@ int of_get_mac_address(struct device_nod
ret = of_get_mac_addr(np, "mac-address", addr);
if (!ret)
@ -75,7 +65,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+ if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) {
+ /* Convert to a contiguous value */
+ mac_val = (addr[3] << 16) + (addr[4] << 8) + addr[5];
+ mac_val += mac_inc << 8 * (5-inc_idx);
+ mac_val += mac_inc;
+
+ /* Apply the incremented value handling overflow case */
+ addr[3] = (mac_val >> 16) & 0xff;

View File

@ -45,7 +45,7 @@ property. This way, the MAC address can be accessed using procfs.
/**
* of_get_mac_address()
* @np: Caller's Device Node
@@ -175,6 +196,7 @@ found:
@@ -165,6 +186,7 @@ found:
addr[5] = (mac_val >> 0) & 0xff;
}

View File

@ -16,16 +16,15 @@ Signed-off-by: Will Moss <willormos@gmail.com>
--- a/net/core/of_net.c
+++ b/net/core/of_net.c
@@ -194,6 +194,12 @@ found:
@@ -184,6 +184,11 @@ found:
addr[3] = (mac_val >> 16) & 0xff;
addr[4] = (mac_val >> 8) & 0xff;
addr[5] = (mac_val >> 0) & 0xff;
+
+ /* Remove mac-address-increment and mac-address-increment-byte
+ * DT property to make sure MAC address would not get incremented
+ * more if this function is stared again. */
+ /* Remove mac-address-increment DT property to make sure MAC
+ * address would not get incremented more if this function is
+ * stared again. */
+ of_remove_property(np, of_find_property(np, "mac-address-increment", NULL));
+ of_remove_property(np, of_find_property(np, "mac-address-increment-byte", NULL));
}
of_add_mac_address(np, addr);

View File

@ -20,14 +20,12 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
--- a/net/core/of_net.c
+++ b/net/core/of_net.c
@@ -119,28 +119,63 @@ static int of_get_mac_addr_nvmem(struct
@@ -119,10 +119,19 @@ static int of_get_mac_addr_nvmem(struct
* this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
* but is all zeros.
*
+ * DT can tell the system to increment the mac-address after is extracted by
+ * using:
+ * - mac-address-increment-byte to decide what byte to increase
+ * (if not defined is increased the last byte)
+ * - mac-address-increment to decide how much to increase. The value WILL
+ * overflow to other bytes if the increment is over 255 or the total
+ * increment will exceed 255 of the current byte.
@ -38,19 +36,11 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
*/
int of_get_mac_address(struct device_node *np, u8 *addr)
{
+ u32 inc_idx, mac_inc, mac_val;
+ u32 mac_inc, mac_val;
int ret;
+ /* Check first if the increment byte is present and valid.
+ * If not set assume to increment the last byte if found.
+ */
+ if (of_property_read_u32(np, "mac-address-increment-byte", &inc_idx))
+ inc_idx = 5;
+ if (inc_idx < 3 || inc_idx > 5)
+ return -EINVAL;
+
if (!np)
return -ENODEV;
@@ -130,17 +139,33 @@ int of_get_mac_address(struct device_nod
ret = of_get_mac_addr(np, "mac-address", addr);
if (!ret)
@ -75,7 +65,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+ if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) {
+ /* Convert to a contiguous value */
+ mac_val = (addr[3] << 16) + (addr[4] << 8) + addr[5];
+ mac_val += mac_inc << 8 * (5-inc_idx);
+ mac_val += mac_inc;
+
+ /* Apply the incremented value handling overflow case */
+ addr[3] = (mac_val >> 16) & 0xff;

View File

@ -45,7 +45,7 @@ property. This way, the MAC address can be accessed using procfs.
/**
* of_get_mac_address()
* @np: Caller's Device Node
@@ -175,6 +196,7 @@ found:
@@ -165,6 +186,7 @@ found:
addr[5] = (mac_val >> 0) & 0xff;
}

View File

@ -16,16 +16,15 @@ Signed-off-by: Will Moss <willormos@gmail.com>
--- a/net/core/of_net.c
+++ b/net/core/of_net.c
@@ -194,6 +194,12 @@ found:
@@ -184,6 +184,11 @@ found:
addr[3] = (mac_val >> 16) & 0xff;
addr[4] = (mac_val >> 8) & 0xff;
addr[5] = (mac_val >> 0) & 0xff;
+
+ /* Remove mac-address-increment and mac-address-increment-byte
+ * DT property to make sure MAC address would not get incremented
+ * more if this function is stared again. */
+ /* Remove mac-address-increment DT property to make sure MAC
+ * address would not get incremented more if this function is
+ * stared again. */
+ of_remove_property(np, of_find_property(np, "mac-address-increment", NULL));
+ of_remove_property(np, of_find_property(np, "mac-address-increment-byte", NULL));
}
of_add_mac_address(np, addr);

View File

@ -319,22 +319,47 @@
label = "PRODUCTDATA";
reg = <0x02b0000 0x0030000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_factory_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_PRODUCTDATA_c: macaddr@c {
reg = <0xc 0x6>;
};
macaddr_PRODUCTDATA_12: macaddr@12 {
reg = <0x12 0x6>;
};
};
};
partition@2e0000 {
label = "ART";
reg = <0x02e0000 0x0040000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
@ -691,28 +716,6 @@
};
};
&factory {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_factory_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_factory_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_PRODUCTDATA_c: macaddr@c {
reg = <0xc 0x6>;
};
macaddr_PRODUCTDATA_12: macaddr@12 {
reg = <0x12 0x6>;
};
};
&hs_phy_0 {
status = "okay";
};

View File

@ -162,16 +162,19 @@
label = "radio";
reg = <0x1b0000 0x40000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
precal_radio_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
precal_radio_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_radio_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_radio_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
@ -189,6 +192,18 @@
label = "default-mac";
reg = <0x1ef0000 0x00200>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_defaultmac_8: macaddr@8 {
compatible = "mac-base";
reg = <0x8 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@1ef0200 {
@ -304,9 +319,8 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_defaultmac_8>, <&precal_radio_1000>;
nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(-1)>;
};
};
};
@ -325,7 +339,7 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_defaultmac_8>, <&precal_radio_5000>;
nvmem-cells = <&macaddr_defaultmac_8 0>, <&precal_radio_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
};
};
@ -445,9 +459,8 @@
pinctrl-0 = <&rgmii2_pins>;
pinctrl-names = "default";
nvmem-cells = <&macaddr_defaultmac_8>;
nvmem-cells = <&macaddr_defaultmac_8 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
fixed-link {
speed = <1000>;
@ -460,7 +473,7 @@
phy-mode = "sgmii";
qcom,id = <2>;
nvmem-cells = <&macaddr_defaultmac_8>;
nvmem-cells = <&macaddr_defaultmac_8 0>;
nvmem-cell-names = "mac-address";
fixed-link {
@ -472,13 +485,3 @@
&adm_dma {
status = "okay";
};
&defaultmac {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_defaultmac_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

View File

@ -209,9 +209,8 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(1)>;
};
};
};
@ -233,9 +232,8 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(2)>;
};
};
};
@ -288,24 +286,29 @@
label = "art";
reg = <0x1200000 0x0140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
precal_art_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
macaddr_art_6: macaddr@6 {
compatible = "mac-base";
reg = <0x6 0x6>;
#nvmem-cell-cells = <1>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_art_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
@ -448,7 +451,7 @@
pinctrl-0 = <&rgmii2_pins>;
pinctrl-names = "default";
nvmem-cells = <&macaddr_art_6>;
nvmem-cells = <&macaddr_art_6 0>;
nvmem-cell-names = "mac-address";
fixed-link {

View File

@ -454,6 +454,7 @@
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
interrupt-controller;
ath10k@0,0 {
reg = <0 0 0 0 0>;
@ -473,6 +474,7 @@
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
interrupt-controller;
ath10k@0,0 {
reg = <0 0 0 0 0>;
@ -492,6 +494,7 @@
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
interrupt-controller;
ath10k@0,0 {
reg = <0 0 0 0 0>;

View File

@ -221,6 +221,20 @@
label = "art";
reg = <0x1200000 0x0140000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
};
};
kernel@1340000 {
@ -393,17 +407,3 @@
&adm_dma {
status = "okay";
};
&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

@ -213,9 +213,8 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(1)>;
};
};
};
@ -237,9 +236,8 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(2)>;
};
};
};
@ -285,24 +283,29 @@
label = "art";
reg = <0x1200000 0x0140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
precal_art_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
macaddr_art_6: macaddr@6 {
compatible = "mac-base";
reg = <0x6 0x6>;
#nvmem-cell-cells = <1>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_art_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
@ -445,7 +448,7 @@
pinctrl-0 = <&rgmii2_pins>;
pinctrl-names = "default";
nvmem-cells = <&macaddr_art_6>;
nvmem-cells = <&macaddr_art_6 0>;
nvmem-cell-names = "mac-address";
fixed-link {

View File

@ -179,6 +179,20 @@
label = "EEPROM";
reg = <0x1c0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_eeprom_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_eeprom_6: macaddr@6 {
reg = <0x6 0x6>;
};
};
};
partition@1d0000 {
@ -299,17 +313,3 @@
&usb3_1 {
status = "okay";
};
&eeprom {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_eeprom_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_eeprom_6: macaddr@6 {
reg = <0x6 0x6>;
};
};

View File

@ -268,12 +268,16 @@
reg = <0xfaf100 0x00200>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_defaultmac_0: macaddr@0 {
reg = <0x0 0x6>;
macaddr_defaultmac_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
@ -282,16 +286,18 @@
reg = <0xfc0000 0x40000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
};
@ -336,9 +342,8 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_defaultmac_0>, <&precal_ART_1000>;
nvmem-cells = <&macaddr_defaultmac_0 (-1)>, <&precal_ART_1000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(-1)>;
};
};
};
@ -357,7 +362,7 @@
compatible = "pci168c,0040";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&macaddr_defaultmac_0>, <&precal_ART_5000>;
nvmem-cells = <&macaddr_defaultmac_0 0>, <&precal_ART_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
};
};
@ -477,9 +482,8 @@
pinctrl-0 = <&rgmii2_pins>;
pinctrl-names = "default";
nvmem-cells = <&macaddr_defaultmac_0>;
nvmem-cells = <&macaddr_defaultmac_0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
fixed-link {
speed = <1000>;
@ -492,7 +496,7 @@
phy-mode = "sgmii";
qcom,id = <2>;
nvmem-cells = <&macaddr_defaultmac_0>;
nvmem-cells = <&macaddr_defaultmac_0 0>;
nvmem-cell-names = "mac-address";
fixed-link {

View File

@ -360,22 +360,47 @@ switch@10 {
label = "PRODUCTDATA";
reg = <0x2b0000 0x30000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_PRODUCTDATA_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_PRODUCTDATA_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_PRODUCTDATA_c: macaddr@c {
reg = <0xc 0x6>;
};
macaddr_PRODUCTDATA_12: macaddr@12 {
reg = <0x12 0x6>;
};
};
};
ART@2e0000 {
label = "ART";
reg = <0x2e0000 0x40000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
@ -522,25 +547,3 @@ switch@10 {
};
};
};
&PRODUCTDATA {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_PRODUCTDATA_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_PRODUCTDATA_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_PRODUCTDATA_c: macaddr@c {
reg = <0xc 0x6>;
};
macaddr_PRODUCTDATA_12: macaddr@12 {
reg = <0x12 0x6>;
};
};

View File

@ -420,32 +420,34 @@
reg = <0x180000 0x40000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ART_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_ART_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_ART_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_ART_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_ART_18: macaddr@18 {
reg = <0x18 0x6>;
};
macaddr_ART_18: macaddr@18 {
reg = <0x18 0x6>;
};
macaddr_ART_1e: macaddr@1e {
reg = <0x1e 0x6>;
};
macaddr_ART_1e: macaddr@1e {
reg = <0x1e 0x6>;
};
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};

View File

@ -261,24 +261,33 @@
label = "art";
reg = <0x1200000 0x0140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
precal_art_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
macaddr_art_6: macaddr@6 {
compatible = "mac-base";
reg = <0x6 0x6>;
#nvmem-cell-cells = <1>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
precal_art_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};

View File

@ -36,13 +36,11 @@
};
&wifi0 {
nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(1)>;
};
&wifi1 {
nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(2)>;
};

View File

@ -209,24 +209,27 @@
label = "0:ART";
reg = <0x1200000 0x0140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ART_0: macaddr@0 {
reg = <0x0 0x6>;
};
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ART_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_ART_0: macaddr@0 {
reg = <0x0 0x6>;
};
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
macaddr_ART_6: macaddr@6 {
reg = <0x6 0x6>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};

View File

@ -188,15 +188,17 @@
reg = <0x1200000 0x0140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
precal_ART_1000: precal@1000 {
reg = <0x1000 0x2f20>;
};
precal_ART_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
};
stock_partition@1340000 {
@ -273,24 +275,26 @@
label = "fw_env";
reg = <0x6400000 0x0100000>;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_fw_env_0: macaddr@0 {
reg = <0x00 0x6>;
};
macaddr_fw_env_6: macaddr@6 {
reg = <0x06 0x6>;
};
macaddr_fw_env_c: macaddr@c {
reg = <0x0c 0x6>;
};
macaddr_fw_env_12: macaddr@12 {
reg = <0x12 0x6>;
};
macaddr_fw_env_18: macaddr@18 {
reg = <0x18 0x6>;
macaddr_fw_env_0: macaddr@0 {
reg = <0x00 0x6>;
};
macaddr_fw_env_6: macaddr@6 {
reg = <0x06 0x6>;
};
macaddr_fw_env_c: macaddr@c {
reg = <0x0c 0x6>;
};
macaddr_fw_env_12: macaddr@12 {
reg = <0x12 0x6>;
};
macaddr_fw_env_18: macaddr@18 {
reg = <0x18 0x6>;
};
};
};
partition@6500000 {

View File

@ -42,9 +42,3 @@
nvmem-cells = <&macaddr_art_0>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
};
&art {
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -42,9 +42,3 @@
nvmem-cells = <&macaddr_art_0>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
};
&art {
macaddr_art_c: macaddr@c {
reg = <0xc 0x6>;
};
};

View File

@ -58,7 +58,7 @@
phy-mode = "sgmii";
phy-handle = <&phy2>;
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 0>;
nvmem-cell-names = "mac-address";
};
@ -84,11 +84,17 @@
pagesize = <32>;
reg = <0x56>;
read-only;
#address-cells = <1>;
#size-cells = <1>;
mac_address: mac-address@66 {
reg = <0x66 0x6>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
mac_address: mac-address@66 {
compatible = "mac-base";
reg = <0x66 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
@ -186,21 +192,18 @@
};
&wifi0 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&wifi1 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
&wifi2 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};
&hs_phy_0 {

View File

@ -80,7 +80,7 @@
phy-mode = "sgmii";
phy-handle = <&phy0>;
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 0>;
nvmem-cell-names = "mac-address";
};
@ -93,9 +93,8 @@
phy-mode = "sgmii";
phy-handle = <&phy4>;
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&gsbi7 {
@ -142,11 +141,17 @@
pagesize = <32>;
reg = <0x52>;
read-only;
#address-cells = <1>;
#size-cells = <1>;
mac_address: mac-address@66 {
reg = <0x66 0x6>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
mac_address: mac-address@66 {
compatible = "mac-base";
reg = <0x66 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
@ -212,21 +217,18 @@
};
&wifi0 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 4>;
nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
};
&wifi1 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};
&wifi2 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
&hs_phy_0 {

View File

@ -97,9 +97,8 @@
&gsw {
phy-mode = "rmii";
phy-handle = <&phy0>;
nvmem-cells = <&macaddr_ath9k_cal_a91>;
nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
mdio-bus {
#address-cells = <1>;
@ -128,6 +127,18 @@
label = "urlader";
reg = <0x00000 0x20000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ath9k_cal_a91: macaddr@a91 {
compatible = "mac-base";
reg = <0xa91 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@20000 {
@ -171,13 +182,3 @@
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
};
};
&ath9k_cal {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ath9k_cal_a91: macaddr@a91 {
reg = <0xa91 0x6>;
};
};

View File

@ -99,9 +99,8 @@
&gsw {
phy-mode = "mii";
phy-handle = <&phy0>;
nvmem-cells = <&macaddr_ath9k_cal_a91>;
nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
mdio-bus {
#address-cells = <1>;
@ -155,6 +154,18 @@
label = "urlader";
reg = <0x00000 0x20000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ath9k_cal_a91: macaddr@a91 {
compatible = "mac-base";
reg = <0xa91 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@20000 {
@ -215,13 +226,3 @@
status = "okay";
vbus-supply = <&usb1_vbus>;
};
&ath9k_cal {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ath9k_cal_a91: macaddr@a91 {
reg = <0xa91 0x6>;
};
};

View File

@ -175,6 +175,16 @@
label = "board";
reg = <0x1fc0000 0x20000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_10024: macaddr@10024 {
reg = <0x10024 0x6>;
};
};
};
partition@1fe0000 {
@ -194,13 +204,3 @@
status = "okay";
vbus-supply = <&usb_vbus>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_10024: macaddr@10024 {
reg = <0x10024 0x6>;
};
};

View File

@ -160,6 +160,16 @@
label = "boardconfig";
reg = <0x3f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -199,13 +209,3 @@
status = "okay";
gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -167,6 +167,16 @@
label = "boardconfig";
reg = <0x3f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -202,13 +212,3 @@
status = "okay";
gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -180,6 +180,16 @@
label = "boardconfig";
reg = <0x3f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -219,13 +229,3 @@
gpios = <&gpio 31 GPIO_ACTIVE_HIGH
&gpiomm 7 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -129,6 +129,16 @@
label = "boardconfig";
reg = <0x3f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -148,13 +158,3 @@
status = "okay";
gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -198,6 +198,16 @@
label = "boardconfig";
reg = <0x3f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -237,13 +247,3 @@
gpios = <&gpio 31 GPIO_ACTIVE_HIGH
&gpiomm 7 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -100,7 +100,7 @@
/* GPIO 19: switch reset */
&gsw {
phy-mode = "rmii";
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 0>;
nvmem-cell-names = "mac-address";
};
@ -136,6 +136,18 @@
label = "board_config";
reg = <0x7f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
compatible = "mac-base";
reg = <0x16 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
};
@ -155,18 +167,7 @@
reg = <0x7000 0 0 0 0>;
ralink,mtd-eeprom = <&boardconfig 0x410>;
ralink,eeprom-swap;
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -153,6 +153,16 @@
label = "board_config";
reg = <0xfe0000 0x20000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -195,13 +205,3 @@
status = "okay";
gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -149,7 +149,7 @@
*/
&gsw {
phy-mode = "mii";
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 0>;
nvmem-cell-names = "mac-address";
};
@ -184,6 +184,18 @@
label = "boardconfig";
reg = <0x7f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
compatible = "mac-base";
reg = <0x16 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
};
@ -213,9 +225,8 @@
compatible = "pci168c,0029";
reg = <0x7000 0 0 0 0>;
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
@ -231,13 +242,3 @@
&vmmc {
status = "okay";
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -179,6 +179,16 @@
label = "board_config";
reg = <0xfe0000 0x20000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -214,13 +224,3 @@
&vmmc {
status = "okay";
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -122,6 +122,16 @@
label = "board_config";
reg = <0x3f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -146,13 +156,3 @@
status = "okay";
gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -192,6 +192,16 @@
label = "board_config";
reg = <0x7f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -241,13 +251,3 @@
status = "okay";
gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -207,6 +207,16 @@
label = "board_config";
reg = <0x7f0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -285,13 +295,3 @@
status = "okay";
gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -107,7 +107,7 @@
&gsw {
phy-mode = "mii";
nvmem-cells = <&macaddr_art_16>;
nvmem-cells = <&macaddr_art_16 0>;
nvmem-cell-names = "mac-address";
};
@ -143,6 +143,18 @@
label = "art";
reg = <0x7f0000 0x10000>; /* 64 KiB*/
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_16: macaddr@16 {
compatible = "mac-base";
reg = <0x16 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
};
@ -160,9 +172,8 @@
compatible = "pci168c,0029";
reg = <0x7000 0 0 0 0>;
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
nvmem-cells = <&macaddr_art_16>;
nvmem-cells = <&macaddr_art_16 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
@ -179,13 +190,3 @@
status = "okay";
gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -207,6 +207,16 @@
label = "boardconfig";
reg = <0x1f80000 0x80000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};
};
};
};
@ -234,13 +244,3 @@
status = "okay";
vbus-supply = <&usb_vbus>;
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -108,7 +108,7 @@
};
&eth0 {
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 0>;
nvmem-cell-names = "mac-address";
};
@ -207,6 +207,18 @@
label = "board_config";
reg = <0xfe0000 0x20000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
compatible = "mac-base";
reg = <0x16 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
};
@ -221,9 +233,8 @@
reg = <0x7000 0 0 0 0>;
ralink,mtd-eeprom = <&boardconfig 0x410>;
ralink,eeprom-swap;
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
@ -246,13 +257,3 @@
&gpio 31 GPIO_ACTIVE_HIGH //still unknown
&gpio 3 GPIO_ACTIVE_HIGH>; //reset_slic?
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -127,9 +127,8 @@
};
&eth0 {
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&gphy0 {
@ -225,6 +224,18 @@
label = "board_config";
reg = <0x40000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
compatible = "mac-base";
reg = <0x16 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
};
@ -239,9 +250,8 @@
reg = <0x7000 0 0 0 0>;
ralink,mtd-eeprom = <&boardconfig 0x410>;
ralink,eeprom-swap;
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cells = <&macaddr_boardconfig_16 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
@ -280,13 +290,3 @@
&gpio 31 GPIO_ACTIVE_HIGH //still unknown
&gpio 3 GPIO_ACTIVE_HIGH>; //reset_slic?
};
&boardconfig {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_boardconfig_16: macaddr@16 {
reg = <0x16 0x6>;
};
};

View File

@ -43,16 +43,20 @@
reg = <0x00000 0x20000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
cal_urlader_985: cal@985 {
reg = <0x985 0x440>;
};
cal_urlader_985: cal@985 {
reg = <0x985 0x440>;
};
macaddr_urlader_a91: macaddr@a91 {
reg = <0xa91 0x6>;
macaddr_urlader_a91: macaddr@a91 {
compatible = "mac-base";
reg = <0xa91 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
@ -77,9 +81,8 @@
};
&eth0 {
nvmem-cells = <&macaddr_urlader_a91>;
nvmem-cells = <&macaddr_urlader_a91 (-2)>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
};
&phy0 {

View File

@ -43,6 +43,18 @@
label = "urlader";
reg = <0x00000 0x20000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_urlader_a91: macaddr@a91 {
compatible = "mac-base";
reg = <0xa91 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@20000 {
@ -66,9 +78,8 @@
};
&eth0 {
nvmem-cells = <&macaddr_urlader_a91>;
nvmem-cells = <&macaddr_urlader_a91 (-2)>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
};
&phy0 {
@ -78,13 +89,3 @@
&phy1 {
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
};
&urlader {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_urlader_a91: macaddr@a91 {
reg = <0xa91 0x6>;
};
};

View File

@ -47,6 +47,18 @@
reg = <0x0 0x40000>;
label = "urlader";
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_urlader_a91: macaddr@a91 {
compatible = "mac-base";
reg = <0xa91 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@40000 {
@ -104,9 +116,8 @@
};
&eth0 {
nvmem-cells = <&macaddr_urlader_a91>;
nvmem-cells = <&macaddr_urlader_a91 (-2)>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-2)>;
};
&phy0 {
@ -116,13 +127,3 @@
&phy1 {
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
};
&urlader {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_urlader_a91: macaddr@a91 {
reg = <0xa91 0x6>;
};
};

View File

@ -110,7 +110,7 @@
};
&eth0 {
nvmem-cells = <&macaddr_ath9k_cal_f100>;
nvmem-cells = <&macaddr_ath9k_cal_f100 0>;
nvmem-cell-names = "mac-address";
};
@ -204,9 +204,8 @@
gpio-controller;
qca,no-eeprom;
ieee80211-freq-limit = <2402000 2482000>;
nvmem-cells = <&macaddr_ath9k_cal_f100>;
nvmem-cells = <&macaddr_ath9k_cal_f100 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
};
};
@ -246,6 +245,18 @@
reg = <0x7d0000 0x30000>;
label = "boardconfig";
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ath9k_cal_f100: macaddr@f100 {
compatible = "mac-base";
reg = <0xf100 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
};
@ -268,13 +279,3 @@
status = "okay";
vbus-supply = <&usb_vbus>;
};
&ath9k_cal {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_ath9k_cal_f100: macaddr@f100 {
reg = <0xf100 0x6>;
};
};

View File

@ -100,7 +100,7 @@
};
&eth0 {
nvmem-cells = <&macaddr_romfile_f100>;
nvmem-cells = <&macaddr_romfile_f100 0>;
nvmem-cell-names = "mac-address";
};
@ -192,9 +192,8 @@
mediatek,mtd-eeprom = <&radio 0x0000>;
big-endian;
ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&macaddr_romfile_f100>;
nvmem-cells = <&macaddr_romfile_f100 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
};
};
@ -245,6 +244,18 @@
reg = <0xfd0000 0x10000>;
label = "romfile";
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_romfile_f100: macaddr@f100 {
compatible = "mac-base";
reg = <0xf100 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@fe0000 {
@ -279,13 +290,3 @@
status = "okay";
vbus-supply = <&usb_vbus>;
};
&romfile {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_romfile_f100: macaddr@f100 {
reg = <0xf100 0x6>;
};
};

View File

@ -87,12 +87,16 @@
label = "hw-info";
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_hwinfo_0: macaddr@0 {
reg = <0x0 0x6>;
macaddr_hwinfo_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
@ -167,43 +171,39 @@
reg = <1>;
label = "lan1";
phy-handle = <&phy_port1>;
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};
port@2 {
reg = <2>;
label = "lan2";
phy-handle = <&phy_port2>;
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};
port@3 {
reg = <3>;
label = "lan3";
phy-handle = <&phy_port3>;
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 4>;
nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
};
port@4 {
reg = <4>;
label = "lan4";
phy-handle = <&phy_port4>;
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 5>;
nvmem-cell-names = "mac-address";
mac-address-increment = <5>;
};
port@5 {
reg = <5>;
label = "wan";
phy-handle = <&phy_port5>;
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 0>;
nvmem-cell-names = "mac-address";
};
@ -232,7 +232,7 @@
enet0: ethernet@b0000 {
status = "okay";
phy-connection-type = "rgmii-id";
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 0>;
nvmem-cell-names = "mac-address";
fixed-link {
@ -286,9 +286,8 @@
reg = <0x0000 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 16>;
nvmem-cell-names = "mac-address";
mac-address-increment = <16>;
};
};
};
@ -326,7 +325,7 @@
/ {
chosen {
linux,stdout-path = "/soc@ffe00000/serial@4500";
stdout-path = "/soc@ffe00000/serial@4500";
};
cpus {

View File

@ -76,12 +76,16 @@
label = "hw-info";
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_hwinfo_0: macaddr@0 {
reg = <0x0 0x6>;
macaddr_hwinfo_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
@ -229,7 +233,7 @@
status = "okay";
phy-handle = <&phy0>;
phy-connection-type = "rgmii-id";
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 0>;
nvmem-cell-names = "mac-address";
};
@ -241,9 +245,8 @@
status = "okay";
phy-handle = <&phy1>;
phy-connection-type = "rgmii-id";
nvmem-cells = <&macaddr_hwinfo_0>;
nvmem-cells = <&macaddr_hwinfo_0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
gpio0: gpio-controller@fc00 {

View File

@ -57,12 +57,14 @@
label = "u-boot";
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_uboot_4fc00: macaddr@4fc00 {
reg = <0x4fc00 0x6>;
macaddr_uboot_4fc00: macaddr@4fc00 {
reg = <0x4fc00 0x6>;
};
};
};

View File

@ -20,7 +20,7 @@
chosen {
bootargs-override = "console=ttyS0,115200";
linux,stdout-path = &serial0;
stdout-path = &serial0;
};
memory {

View File

@ -14,7 +14,7 @@
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy4>;
nvmem-cells = <&macaddr_eeprom_0>;
nvmem-cells = <&macaddr_eeprom_0 0>;
nvmem-cell-names = "mac-address";
};
};

View File

@ -32,7 +32,7 @@
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy4>;
nvmem-cells = <&macaddr_eeprom_0>;
nvmem-cells = <&macaddr_eeprom_0 0>;
nvmem-cell-names = "mac-address";
};
};
@ -45,9 +45,8 @@
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy8>;
nvmem-cells = <&macaddr_eeprom_0>;
nvmem-cells = <&macaddr_eeprom_0 4>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(4)>;
};
ethernet@1 {
@ -55,9 +54,8 @@
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy9>;
nvmem-cells = <&macaddr_eeprom_0>;
nvmem-cells = <&macaddr_eeprom_0 5>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(5)>;
};
};
};

View File

@ -117,16 +117,20 @@
};
partition@400000 {
compatible = "nvmem-cells";
reg = <0x400000 0x10000>;
label = "eeprom";
read-only;
reg = <0x400000 0x10000>;
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_eeprom_0: macaddr@0 {
reg = <0x0 0x6>;
macaddr_eeprom_0: macaddr@0 {
compatible = "mac-base";
reg = <0x0 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
@ -194,9 +198,8 @@
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy5>;
nvmem-cells = <&macaddr_eeprom_0>;
nvmem-cells = <&macaddr_eeprom_0 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(1)>;
};
ethernet@2 {
@ -204,9 +207,8 @@
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy6>;
nvmem-cells = <&macaddr_eeprom_0>;
nvmem-cells = <&macaddr_eeprom_0 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(2)>;
};
ethernet@3 {
@ -214,10 +216,8 @@
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy7>;
nvmem-cells = <&macaddr_eeprom_0>;
nvmem-cells = <&macaddr_eeprom_0 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(3)>;
};
};
};

View File

@ -606,6 +606,7 @@ define Device/tplink_archer-c50-v6
TPLINK_HWREVADD := 0x6
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7663-firmware-ap
IMAGES := sysupgrade.bin
DEFAULT := n
endef
TARGET_DEVICES += tplink_archer-c50-v6

View File

@ -11,9 +11,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
PKG_SOURCE_DATE:=2023-11-03
PKG_SOURCE_VERSION:=ba5bc4e1ae9d3e7b41d3bed39ce505670dc95078
PKG_MIRROR_HASH:=f14e0153443493c2908a2145c206798e01c66d985a81e259187007c464574b72
PKG_SOURCE_DATE:=2023-11-21
PKG_SOURCE_VERSION:=12bf1a99bd6eebae90caa144bb4d8b0cd763ff8f
PKG_MIRROR_HASH:=923508e729b4c1fcc497f18ad5fa33c62dc74b9aeac1a3f215b3291892903baf
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk