298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "treewide: convert mtd-mac-address-increment* to generic implementation"

Browse Source 
This reverts commit 82d9b3e2c4.
This commit is contained in:
coolsnowwolf 2021-07-23 00:29:52 +08:00
parent 82d9b3e2c4
commit 65068ed984
158 changed files with 376 additions and 633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ath79/dts/ar7161_aruba_ap-105.dts
View File

@ -104,7 +104,7 @@
ath9k0: wifi@0,11 { /* 2.4 GHz */
compatible = "pci168c,0029";
mtd-mac-address = <&hwinfo 0x1c>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
reg = <0x8800 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;
@ -113,7 +113,7 @@
ath9k1: wifi@0,12 { /* 5 GHz */
compatible = "pci168c,0029";
mtd-mac-address = <&hwinfo 0x1c>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
reg = <0x9000 0 0 0 0>;
#gpio-cells = <2>;
gpio-controller;

2
target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
View File

@ -259,7 +259,7 @@
status = "okay";
mtd-mac-address = <&art 0x520c>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
phy-handle = <&phy4>;
};

4
target/linux/ath79/dts/ar7161_meraki_mr16.dts
View File

@ -82,7 +82,7 @@
reg = <0x8800 0 0 0 0>;
qca,no-eeprom;
mtd-mac-address = <&config 0x66>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
#gpio-cells = <2>;
gpio-controller;
};
@ -92,7 +92,7 @@
reg = <0x9000 0 0 0 0>;
qca,no-eeprom;
mtd-mac-address = <&config 0x66>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
#gpio-cells = <2>;
gpio-controller;
};

2
target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
View File

@ -160,7 +160,7 @@
status = "okay";
mtd-mac-address = <&art 0x120c>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&pcie {

2
target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
View File

@ -190,7 +190,7 @@
compatible = "pci168c,002b";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;

2
target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
View File

@ -123,7 +123,7 @@
compatible = "pci168c,002b";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;

4
target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
View File

@ -31,12 +31,12 @@
&eth0 {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&eth1 {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&ath9k {

2
target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
View File

@ -195,7 +195,7 @@
compatible = "pci168c,002e";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;

2
target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
View File

@ -171,7 +171,7 @@
compatible = "pci168c,002e";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;

4
target/linux/ath79/dts/ar7241_tplink.dtsi
View File

@ -97,10 +97,10 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&eth1 {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};

4
target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
View File

@ -143,10 +143,10 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&eth1 {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};

2
target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
View File

@ -78,7 +78,7 @@
compatible = "pci168c,002a";
reg = <0x0 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;

2
target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
View File

@ -78,7 +78,7 @@
compatible = "pci168c,002a";
reg = <0x0 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;

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

@ -82,7 +82,7 @@
reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
mtd-mac-address = <&config 0x66>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
};

4
target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
View File

@ -94,8 +94,8 @@
status = "okay";
mtd-mac-address = <&art 0x1002>;
mac-address-increment-byte = <3>;
mac-address-increment = <0x40>;
mtd-mac-address-increment-byte = <3>;
mtd-mac-address-increment = <0x40>;
};
&mdio1 {

4
target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
View File

@ -25,7 +25,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
gmac-config {
device = <&gmac>;
@ -39,7 +39,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&pinmux {

2
target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
View File

@ -61,7 +61,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&usb {

4
target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
View File

@ -122,7 +122,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
gmac-config {
device = <&gmac>;
@ -136,7 +136,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&wmac {

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

@ -134,7 +134,7 @@
phy-handle = <&swphy0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/ar9341_tplink.dtsi
View File

@ -82,7 +82,7 @@
phy-handle = <&swphy0>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&eth1 {

4
target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
View File

@ -107,7 +107,7 @@
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&hw_info 0x0>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};
};
@ -161,7 +161,7 @@
status = "okay";
mtd-mac-address = <&hw_info 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&nand {

2
target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
View File

@ -131,7 +131,7 @@
pll-data = <0x02000000 0x00000101 0x00001616>;
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
phy-mode = "rgmii";
phy-handle = <&phy0>;

4
target/linux/ath79/dts/ar9344_engenius_eap600.dts
View File

@ -30,7 +30,7 @@
&eth0 {
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
};
&pcie {
@ -41,5 +41,5 @@
&wmac {
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};

4
target/linux/ath79/dts/ar9344_engenius_ecb600.dts
View File

@ -30,11 +30,11 @@
&pcie {
wifi@0,0,0 {
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
};
};
&wmac {
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};

4
target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
View File

@ -114,7 +114,7 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&pcie {
@ -125,6 +125,6 @@
reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <8>;
mtd-mac-address-increment = <8>;
};
};

4
target/linux/ath79/dts/ar9344_pcs_cap324.dts
View File

@ -119,7 +119,7 @@
compatible = "168c,0030";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
mtd-cal-data = <&art 0x5000>;
qca,no-eeprom;
qca,disable-5ghz;
@ -134,7 +134,7 @@
qca,disable-2ghz;
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&mdio0 {

2
target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
View File

@ -25,7 +25,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&pridata 0x400>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
View File

@ -25,7 +25,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&pridata 0x400>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

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

@ -67,7 +67,7 @@
phy-handle = <&swphy0>;
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
gmac-config {
device = <&gmac>;

2
target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
View File

@ -165,7 +165,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&config 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

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

@ -164,7 +164,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&config 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
View File

@ -148,7 +148,7 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&config 0x0>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};
&pinmux {

6
target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
View File

@ -58,7 +58,7 @@
&ath9k {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&wmac {
@ -69,7 +69,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
gmac-config {
device = <&gmac>;
@ -84,5 +84,5 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};

2
target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
View File

@ -85,7 +85,7 @@
&wmac {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&mdio0 {

4
target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
View File

@ -142,7 +142,7 @@
reg = <0x0000 0 0 0 0>;
qca,no-eeprom;
mtd-mac-address = <&addr 0x0>;
mac-address-increment = <0x10>;
mtd-mac-address-increment = <0x10>;
#gpio-cells = <2>;
gpio-controller;
};
@ -198,7 +198,7 @@
pll-data = <0xe000000 0x04000101 0x04001313>;
mtd-mac-address = <&addr 0x0>;
mac-address-increment = <0x21>;
mtd-mac-address-increment = <0x21>;
phy-mode = "rgmii-rxid";
phy-handle = <&phy4>;

4
target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
View File

@ -107,12 +107,12 @@
&eth0 {
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
};
&eth1 {
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&pcie0 {

2
target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
View File

@ -46,7 +46,7 @@
&eth0 {
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&eth1 {

4
target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
View File

@ -51,7 +51,7 @@
&eth0 {
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
};
&eth1 {
@ -60,7 +60,7 @@
compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&gpio_export {

4
target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
View File

@ -151,7 +151,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {
@ -163,5 +163,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <10>;
mtd-mac-address-increment = <10>;
};

4
target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
View File

@ -110,7 +110,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {
@ -122,5 +122,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <3>;
mtd-mac-address-increment = <3>;
};

2
target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
View File

@ -122,5 +122,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <10>;
mtd-mac-address-increment = <10>;
};

2
target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
View File

@ -151,7 +151,7 @@
&eth1 {
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&wmac {

2
target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
View File

@ -134,7 +134,7 @@
&eth1 {
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&wmac {

2
target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
View File

@ -123,7 +123,7 @@
&eth1 {
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&wmac {

2
target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
View File

@ -96,7 +96,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&pridata 0x400>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
View File

@ -147,7 +147,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&romfile 0xf100>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
View File

@ -172,7 +172,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

4
target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
View File

@ -129,12 +129,12 @@
phy-handle = <&swphy0>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};
&wmac {

2
target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
View File

@ -148,7 +148,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&info 0x8>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
View File

@ -149,5 +149,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};

4
target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
View File

@ -124,7 +124,7 @@
compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&wmac {
@ -132,5 +132,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};

2
target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
View File

@ -74,7 +74,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
View File

@ -109,7 +109,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
View File

@ -149,7 +149,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
View File

@ -91,7 +91,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

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

@ -90,5 +90,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};

2
target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
View File

@ -100,7 +100,7 @@
status = "okay";
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
phy-handle = <&phy2>;

3
target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
View File

@ -90,6 +90,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
qca-no-eeprom;
mtd-mac-address-increment = <1>;
};

2
target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
View File

@ -199,7 +199,7 @@
status = "okay";
mtd-mac-address = <&art 0x0>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
pll-data = <0x03000101 0x00000101 0x00001616>;
fixed-link {

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

@ -59,7 +59,7 @@
status = "okay";
mtd-mac-address = <&art 0x00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
phy-handle = <&phy1>;
pll-data = <0x03000101 0x00000101 0x00001313>;

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

@ -94,7 +94,7 @@
status = "okay";
mtd-mac-address = <&art 0x00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
phy-handle = <&phy1>;
pll-data = <0x03000101 0x00000101 0x00001313>;

2
target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
View File

@ -114,5 +114,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x00>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
};

2
target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
View File

@ -157,7 +157,7 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&pcie0 {

2
target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
View File

@ -20,6 +20,6 @@
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <16>;
mtd-mac-address-increment = <16>;
};
};

2
target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
View File

@ -20,6 +20,6 @@
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <16>;
mtd-mac-address-increment = <16>;
};
};

2
target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
View File

@ -128,7 +128,7 @@
phy-handle = <&phy0>;
mtd-mac-address = <&pridata 0x400>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
View File

@ -150,7 +150,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
phy-handle = <&phy0>;
pll-data = <0x56000000 0x00000101 0x00001616>;

2
target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
View File

@ -71,7 +71,7 @@
&eth0 {
mtd-mac-address = <&romfs 0xf100>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
View File

@ -65,7 +65,7 @@
&eth0 {
mtd-mac-address = <&romfs 0xf100>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
View File

@ -166,5 +166,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};

6
target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
View File

@ -97,7 +97,7 @@
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;
@ -191,7 +191,7 @@
status = "okay";
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
phy-handle = <&phy0>;
pll-data = <0x56000000 0x00000101 0x00001616>;
@ -218,5 +218,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};

2
target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
View File

@ -146,7 +146,7 @@
pll-data = <0x56000000 0x00000101 0x00001616>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
phy-handle = <&phy0>;
};

2
target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
View File

@ -179,7 +179,7 @@
status = "okay";
mtd-mac-address = <&info 0x8>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&wmac {

2
target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
View File

@ -127,7 +127,7 @@
phy-handle = <&swphy0>;
mtd-mac-address = <&info 0x8>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
gmac-config {
device = <&gmac>;

2
target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
View File

@ -73,7 +73,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&info 0x8>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

2
target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
View File

@ -134,5 +134,5 @@
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};

2
target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
View File

@ -106,7 +106,7 @@
pll-data = <0x03000101 0x00000101 0x00001919>;
mtd-mac-address = <&art 0x1002>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
phy-mode = "sgmii";
phy-handle = <&phy0>;
};

2
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
View File

@ -64,5 +64,5 @@
&eth1 {
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <(-1)>;
mtd-mac-address-increment = <(-1)>;
};

2
target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
View File

@ -51,7 +51,7 @@
phy-handle = <&swphy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
&eth1 {

45
target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch → target/linux/generic/pending-5.10/681-NET-add-of_get_mac_address_mtd.patch
View File

@ -1,7 +1,5 @@
From 6f8e5369ae054ec6c9265581d5a7e39738a5cd84 Mon Sep 17 00:00:00 2001
From: Ansuel Smith <ansuelsmth@gmail.com>
Date: Tue, 30 Mar 2021 13:16:38 +0200
Subject: [PATCH 1/2] NET: add mtd-mac-address support to of_get_mac_address()
From: John Crispin <blogic@openwrt.org>
Subject: NET: add mtd-mac-address support to of_get_mac_address()
Many embedded devices have information such as mac addresses stored inside mtd
devices. This patch allows us to add a property inside a node describing a
@ -10,13 +8,11 @@ where the mac address can be found.
Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/of/of_net.c | 75 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 74 insertions(+), 1 deletion(-)
drivers/of/of_net.c | 37 +++++++++++++++++++++++++++++++++++++
include/linux/of_net.h | 1 +
2 files changed, 38 insertions(+)
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index 6e411821583e..f072e2509cc9 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -11,6 +11,7 @@
@ -27,7 +23,7 @@ index 6e411821583e..f072e2509cc9 100644
/**
* of_get_phy_mode - Get phy mode for given device_node
@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *np, phy_interface_t *interface)
@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *
}
EXPORT_SYMBOL_GPL(of_get_phy_mode);
@ -36,7 +32,7 @@ index 6e411821583e..f072e2509cc9 100644
{
struct property *pp = of_find_property(np, name, NULL);
@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
@@ -78,6 +79,79 @@ static const void *of_get_mac_addr_nvmem
return mac;
}
@ -51,8 +47,10 @@ index 6e411821583e..f072e2509cc9 100644
+ const char *part;
+ const __be32 *list;
+ phandle phandle;
+ u32 mac_inc = 0;
+ u8 mac[ETH_ALEN];
+ void *addr;
+ u32 inc_idx;
+
+ list = of_get_property(np, "mtd-mac-address", &size);
+ if (!list || (size != (2 * sizeof(*list))))
@ -76,6 +74,14 @@ index 6e411821583e..f072e2509cc9 100644
+ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
+ put_mtd_device(mtd);
+
+ if (of_property_read_u32(np, "mtd-mac-address-increment-byte", &inc_idx))
+ inc_idx = 5;
+ if (inc_idx > 5)
+ return NULL;
+
+ if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
+ mac[inc_idx] += mac_inc;
+
+ if (!is_valid_ether_addr(mac))
+ return NULL;
+
@ -102,12 +108,11 @@ index 6e411821583e..f072e2509cc9 100644
+#endif
+ return NULL;
+}
+
+
/**
* Search the device tree for the best MAC address to use. 'mac-address' is
* checked first, because that is supposed to contain to "most recent" MAC
@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
@@ -98,12 +172,20 @@ static const void *of_get_mac_addr_nvmem
* this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
* but is all zeros.
*
@ -118,17 +123,13 @@ index 6e411821583e..f072e2509cc9 100644
* Return: Will be a valid pointer on success and ERR_PTR in case of error.
*/
const void *of_get_mac_address(struct device_node *np)
@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct device_node *np)
if (addr)
return addr;
{
const void *addr;
+ addr = of_get_mac_address_mtd(np);
+ if (addr)
+ return addr;
+
return of_get_mac_addr_nvmem(np);
}
EXPORT_SYMBOL(of_get_mac_address);
--
2.30.2
addr = of_get_mac_addr(np, "mac-address");
if (addr)
return addr;

133
target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch
View File

@ -1,133 +0,0 @@
From 639dba857aa554f2a78572adc4cf3c32de9ec2e2 Mon Sep 17 00:00:00 2001
From: Ansuel Smith <ansuelsmth@gmail.com>
Date: Tue, 30 Mar 2021 18:21:14 +0200
Subject: [PATCH 2/2] of_net: add mac-address-increment support
Lots of embedded devices use the mac-address of other interface
extracted from nvmem cells and increments it by one or two. Add two
bindings to integrate this and directly use the right mac-address for
the interface. Some example are some routers that use the gmac
mac-address stored in the art partition and increments it by one for the
wifi. mac-address-increment-byte bindings is used to tell what byte of
the mac-address has to be increased (if not defined the last byte is
increased) and mac-address-increment tells how much the byte decided
early has to be increased.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 45 insertions(+), 14 deletions(-)
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index f072e2509cc9..0dbd1f7ef396 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name)
return NULL;
}
-static const void *of_get_mac_addr_nvmem(struct device_node *np)
+static void *of_get_mac_addr_nvmem(struct device_node *np, int *err)
{
int ret;
- const void *mac;
+ void *mac;
u8 nvmem_mac[ETH_ALEN];
struct platform_device *pdev = of_find_device_by_node(np);
- if (!pdev)
- return ERR_PTR(-ENODEV);
+ if (!pdev) {
+ *err = -ENODEV;
+ return NULL;
+ }
ret = nvmem_get_mac_address(&pdev->dev, &nvmem_mac);
if (ret) {
put_device(&pdev->dev);
- return ERR_PTR(ret);
+ *err = ret;
+ return NULL;
}
mac = devm_kmemdup(&pdev->dev, nvmem_mac, ETH_ALEN, GFP_KERNEL);
put_device(&pdev->dev);
- if (!mac)
- return ERR_PTR(-ENOMEM);
+ if (!mac) {
+ *err = -ENOMEM;
+ return NULL;
+ }
return mac;
}
-static const void *of_get_mac_address_mtd(struct device_node *np)
+static void *of_get_mac_address_mtd(struct device_node *np)
{
#ifdef CONFIG_MTD
struct device_node *mtd_np = NULL;
@@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np)
* If a mtd-mac-address property exists, try to fetch the MAC address from the
* specified mtd device, and store it as a 'mac-address' property
*
+ * 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
+ * not overflow to other bytes if the increment is over 255.
+ * (example 00:01:02:03:04:ff + 1 == 00:01:02:03:04:00)
+ *
* Return: Will be a valid pointer on success and ERR_PTR in case of error.
*/
const void *of_get_mac_address(struct device_node *np)
{
- const void *addr;
+ u32 inc_idx, mac_inc;
+ int ret = 0;
+ u8 *addr;
+
+ /* 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 ERR_PTR(-EINVAL);
addr = of_get_mac_addr(np, "mac-address");
if (addr)
- return addr;
+ goto found;
addr = of_get_mac_addr(np, "local-mac-address");
if (addr)
- return addr;
+ goto found;
addr = of_get_mac_addr(np, "address");
if (addr)
- return addr;
+ goto found;
addr = of_get_mac_address_mtd(np);
if (addr)
- return addr;
+ goto found;
+
+ addr = of_get_mac_addr_nvmem(np, &ret);
+ if (ret)
+ return ERR_PTR(ret);
+
+found:
+ if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
+ addr[inc_idx] += mac_inc;
- return of_get_mac_addr_nvmem(np);
+ return addr;
}
EXPORT_SYMBOL(of_get_mac_address);
--
2.30.2

45
target/linux/generic/pending-5.4/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch → target/linux/generic/pending-5.4/681-NET-add-of_get_mac_address_mtd.patch
View File

@ -1,7 +1,5 @@
From 6f8e5369ae054ec6c9265581d5a7e39738a5cd84 Mon Sep 17 00:00:00 2001
From: Ansuel Smith <ansuelsmth@gmail.com>
Date: Tue, 30 Mar 2021 13:16:38 +0200
Subject: [PATCH 1/2] NET: add mtd-mac-address support to of_get_mac_address()
From: John Crispin <blogic@openwrt.org>
Subject: NET: add mtd-mac-address support to of_get_mac_address()
Many embedded devices have information such as mac addresses stored inside mtd
devices. This patch allows us to add a property inside a node describing a
@ -10,13 +8,11 @@ where the mac address can be found.
Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/of/of_net.c | 75 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 74 insertions(+), 1 deletion(-)
drivers/of/of_net.c | 37 +++++++++++++++++++++++++++++++++++++
include/linux/of_net.h | 1 +
2 files changed, 38 insertions(+)
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index 6e411821583e..f072e2509cc9 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -11,6 +11,7 @@
@ -27,7 +23,7 @@ index 6e411821583e..f072e2509cc9 100644
/**
* of_get_phy_mode - Get phy mode for given device_node
@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *np, phy_interface_t *interface)
@@ -39,7 +40,7 @@ int of_get_phy_mode(struct device_node *
}
EXPORT_SYMBOL_GPL(of_get_phy_mode);
@ -36,7 +32,7 @@ index 6e411821583e..f072e2509cc9 100644
{
struct property *pp = of_find_property(np, name, NULL);
@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
@@ -72,6 +73,79 @@ static const void *of_get_mac_addr_nvmem
return mac;
}
@ -51,8 +47,10 @@ index 6e411821583e..f072e2509cc9 100644
+ const char *part;
+ const __be32 *list;
+ phandle phandle;
+ u32 mac_inc = 0;
+ u8 mac[ETH_ALEN];
+ void *addr;
+ u32 inc_idx;
+
+ list = of_get_property(np, "mtd-mac-address", &size);
+ if (!list || (size != (2 * sizeof(*list))))
@ -76,6 +74,14 @@ index 6e411821583e..f072e2509cc9 100644
+ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
+ put_mtd_device(mtd);
+
+ if (of_property_read_u32(np, "mtd-mac-address-increment-byte", &inc_idx))
+ inc_idx = 5;
+ if (inc_idx > 5)
+ return NULL;
+
+ if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
+ mac[inc_idx] += mac_inc;
+
+ if (!is_valid_ether_addr(mac))
+ return NULL;
+
@ -102,12 +108,11 @@ index 6e411821583e..f072e2509cc9 100644
+#endif
+ return NULL;
+}
+
+
/**
* Search the device tree for the best MAC address to use. 'mac-address' is
* checked first, because that is supposed to contain to "most recent" MAC
@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
@@ -92,12 +166,20 @@ static const void *of_get_mac_addr_nvmem
* this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
* but is all zeros.
*
@ -118,17 +123,13 @@ index 6e411821583e..f072e2509cc9 100644
* Return: Will be a valid pointer on success and ERR_PTR in case of error.
*/
const void *of_get_mac_address(struct device_node *np)
@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct device_node *np)
if (addr)
return addr;
{
const void *addr;
+ addr = of_get_mac_address_mtd(np);
+ if (addr)
+ return addr;
+
return of_get_mac_addr_nvmem(np);
}
EXPORT_SYMBOL(of_get_mac_address);
--
2.30.2
addr = of_get_mac_addr(np, "mac-address");
if (addr)
return addr;

133
target/linux/generic/pending-5.4/682-of_net-add-mac-address-increment-support.patch
View File

@ -1,133 +0,0 @@
From 639dba857aa554f2a78572adc4cf3c32de9ec2e2 Mon Sep 17 00:00:00 2001
From: Ansuel Smith <ansuelsmth@gmail.com>
Date: Tue, 30 Mar 2021 18:21:14 +0200
Subject: [PATCH 2/2] of_net: add mac-address-increment support
Lots of embedded devices use the mac-address of other interface
extracted from nvmem cells and increments it by one or two. Add two
bindings to integrate this and directly use the right mac-address for
the interface. Some example are some routers that use the gmac
mac-address stored in the art partition and increments it by one for the
wifi. mac-address-increment-byte bindings is used to tell what byte of
the mac-address has to be increased (if not defined the last byte is
increased) and mac-address-increment tells how much the byte decided
early has to be increased.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 45 insertions(+), 14 deletions(-)
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index f072e2509cc9..0dbd1f7ef396 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name)
return NULL;
}
-static const void *of_get_mac_addr_nvmem(struct device_node *np)
+static void *of_get_mac_addr_nvmem(struct device_node *np, int *err)
{
int ret;
- const void *mac;
+ void *mac;
u8 nvmem_mac[ETH_ALEN];
struct platform_device *pdev = of_find_device_by_node(np);
- if (!pdev)
- return ERR_PTR(-ENODEV);
+ if (!pdev) {
+ *err = -ENODEV;
+ return NULL;
+ }
ret = nvmem_get_mac_address(&pdev->dev, &nvmem_mac);
if (ret) {
put_device(&pdev->dev);
- return ERR_PTR(ret);
+ *err = ret;
+ return NULL;
}
mac = devm_kmemdup(&pdev->dev, nvmem_mac, ETH_ALEN, GFP_KERNEL);
put_device(&pdev->dev);
- if (!mac)
- return ERR_PTR(-ENOMEM);
+ if (!mac) {
+ *err = -ENOMEM;
+ return NULL;
+ }
return mac;
}
-static const void *of_get_mac_address_mtd(struct device_node *np)
+static void *of_get_mac_address_mtd(struct device_node *np)
{
#ifdef CONFIG_MTD
struct device_node *mtd_np = NULL;
@@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np)
* If a mtd-mac-address property exists, try to fetch the MAC address from the
* specified mtd device, and store it as a 'mac-address' property
*
+ * 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
+ * not overflow to other bytes if the increment is over 255.
+ * (example 00:01:02:03:04:ff + 1 == 00:01:02:03:04:00)
+ *
* Return: Will be a valid pointer on success and ERR_PTR in case of error.
*/
const void *of_get_mac_address(struct device_node *np)
{
- const void *addr;
+ u32 inc_idx, mac_inc;
+ int ret = 0;
+ u8 *addr;
+
+ /* 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 ERR_PTR(-EINVAL);
addr = of_get_mac_addr(np, "mac-address");
if (addr)
- return addr;
+ goto found;
addr = of_get_mac_addr(np, "local-mac-address");
if (addr)
- return addr;
+ goto found;
addr = of_get_mac_addr(np, "address");
if (addr)
- return addr;
+ goto found;
addr = of_get_mac_address_mtd(np);
if (addr)
- return addr;
+ goto found;
+
+ addr = of_get_mac_addr_nvmem(np, &ret);
+ if (ret)
+ return ERR_PTR(ret);
+
+found:
+ if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
+ addr[inc_idx] += mac_inc;
- return of_get_mac_addr_nvmem(np);
+ return addr;
}
EXPORT_SYMBOL(of_get_mac_address);
--
2.30.2

2
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi
View File

@ -303,7 +303,7 @@
pinctrl-names = "default";
mtd-mac-address = <&defaultmac 0x8>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
fixed-link {
speed = <1000>;

2
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
View File

@ -324,7 +324,7 @@
pinctrl-names = "default";
mtd-mac-address = <&defaultmac 0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
fixed-link {
speed = <1000>;

4
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
View File

@ -440,7 +440,7 @@
reg = <0x00010000 0 0 0 0>;
mtd-mac-address = <&art 6>;
mac-address-increment = <(1)>;
mtd-mac-address-increment = <(1)>;
};
};
};
@ -460,7 +460,7 @@
reg = <0x00010000 0 0 0 0>;
mtd-mac-address = <&art 6>;
mac-address-increment = <(2)>;
mtd-mac-address-increment = <(2)>;
};
};
};

2
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
View File

@ -97,7 +97,7 @@
phy-mode = "rmii";
phy-handle = <&phy0>;
mtd-mac-address = <&ath9k_cal 0xa91>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
mdio-bus {
#address-cells = <1>;

2
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
View File

@ -98,7 +98,7 @@
&gsw {
phy-mode = "mii";
mtd-mac-address = <&ath9k_cal 0xa91>;
mac-address-increment = <(-2)>;
mtd-mac-address-increment = <(-2)>;
};
&gpio {

2
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
View File

@ -155,6 +155,6 @@
ralink,mtd-eeprom = <&boardconfig 0x410>;
ralink,mtd-eeprom-swap;
mtd-mac-address = <&boardconfig 0x16>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
};

2
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
View File

@ -213,7 +213,7 @@
reg = <0x7000 0 0 0 0>;
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
mtd-mac-address = <&boardconfig 0x16>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
};

2
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
View File

@ -160,7 +160,7 @@
reg = <0x7000 0 0 0 0>;
qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
mtd-mac-address = <&art 0x16>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
};

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

@ -233,7 +233,7 @@
ralink,mtd-eeprom = <&boardconfig 0x410>;
ralink,mtd-eeprom-swap;
mtd-mac-address = <&boardconfig 0x16>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
};

144
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
View File

@ -127,9 +127,76 @@
};
&eth0 {
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led0_pins>;
pinctrl-names = "default";
interface@0 {
compatible = "lantiq,xrx200-pdi";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
mtd-mac-address = <&boardconfig 0x16>;
mtd-mac-address-increment = <1>;
lantiq,switch;
ethernet@0 {
compatible = "lantiq,xrx200-pdi-port";
reg = <0>;
phy-mode = "rgmii";
phy-handle = <&phy0>;
};
ethernet@1 {
compatible = "lantiq,xrx200-pdi-port";
reg = <1>;
phy-mode = "rgmii";
phy-handle = <&phy1>;
};
ethernet@2 {
compatible = "lantiq,xrx200-pdi-port";
reg = <2>;
phy-mode = "gmii";
phy-handle = <&phy11>;
};
ethernet@4 {
compatible = "lantiq,xrx200-pdi-port";
reg = <4>;
phy-mode = "gmii";
phy-handle = <&phy13>;
};
ethernet@5 {
compatible = "lantiq,xrx200-pdi-port";
reg = <5>;
phy-mode = "rgmii";
phy-handle = <&phy5>;
};
};
mdio {
#address-cells = <1>;
#size-cells = <0>;
compatible = "lantiq,xrx200-mdio";
phy0: ethernet-phy@0 {
reg = <0x0>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
};
phy1: ethernet-phy@1 {
reg = <0x1>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
};
phy5: ethernet-phy@5 {
reg = <0x5>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
};
phy11: ethernet-phy@11 {
reg = <0x11>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
};
phy13: ethernet-phy@13 {
reg = <0x13>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
};
};
};
&gphy0 {
@ -154,62 +221,6 @@
};
};
&gswip {
pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led0_pins>;
pinctrl-names = "default";
};
&gswip_mdio {
phy0: ethernet-phy@0 {
reg = <0x0>;
};
phy1: ethernet-phy@1 {
reg = <0x1>;
};
phy5: ethernet-phy@5 {
reg = <0x5>;
};
phy11: ethernet-phy@11 {
reg = <0x11>;
};
phy13: ethernet-phy@13 {
reg = <0x13>;
};
};
&gswip_ports {
port@0 {
reg = <0>;
label = "lan4";
phy-mode = "rgmii";
phy-handle = <&phy0>;
};
port@1 {
reg = <1>;
label = "lan3";
phy-mode = "rgmii";
phy-handle = <&phy1>;
};
port@2 {
reg = <2>;
label = "lan2";
phy-mode = "internal";
phy-handle = <&phy11>;
};
port@4 {
reg = <4>;
label = "lan1";
phy-mode = "internal";
phy-handle = <&phy13>;
};
port@5 {
reg = <5>;
label = "wan";
phy-mode = "rgmii";
phy-handle = <&phy5>;
};
};
&localbus {
flash@0 {
compatible = "lantiq,nor";
@ -239,9 +250,8 @@
reg = <0x7000 0 0 0 0>;
ralink,mtd-eeprom = <&boardconfig 0x410>;
ralink,mtd-eeprom-swap;
nvmem-cells = <&macaddr_boardconfig_16>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
mtd-mac-address = <&boardconfig 0x16>;
mtd-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>;
};
};

122
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
View File

@ -81,8 +81,71 @@
};
&eth0 {
mtd-mac-address = <&urlader 0xa91>;
mac-address-increment = <(-2)>;
interface@0 {
compatible = "lantiq,xrx200-pdi";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
mtd-mac-address = <&urlader 0xa91>;
mtd-mac-address-increment = <(-2)>;
lantiq,switch;
ethernet@0 {
compatible = "lantiq,xrx200-pdi-port";
reg = <0>;
phy-mode = "rmii";
phy-handle = <&phy0>;
};
ethernet@1 {
compatible = "lantiq,xrx200-pdi-port";
reg = <1>;
phy-mode = "rmii";
phy-handle = <&phy1>;
};
ethernet@2 {
compatible = "lantiq,xrx200-pdi-port";
reg = <2>;
phy-mode = "gmii";
phy-handle = <&phy11>;
};
ethernet@4 {
compatible = "lantiq,xrx200-pdi-port";
reg = <4>;
phy-mode = "gmii";
phy-handle = <&phy13>;
};
};
mdio {
#address-cells = <1>;
#size-cells = <0>;
compatible = "lantiq,xrx200-mdio";
phy0: ethernet-phy@0 {
reg = <0x00>;
compatible = "ethernet-phy-ieee802.3-c22";
reset-gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
};
phy1: ethernet-phy@1 {
reg = <0x01>;
compatible = "ethernet-phy-ieee802.3-c22";
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
};
phy11: ethernet-phy@11 {
reg = <0x11>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
};
phy13: ethernet-phy@13 {
reg = <0x13>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
};
};
};
&gphy0 {
@ -108,61 +171,6 @@
};
&gswip {
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
};
&gswip_mdio {
phy0: ethernet-phy@0 {
reg = <0x00>;
reset-gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
};
phy1: ethernet-phy@1 {
reg = <0x01>;
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
};
phy11: ethernet-phy@11 {
reg = <0x11>;
};
phy13: ethernet-phy@13 {
reg = <0x13>;
};
};
&gswip_ports {
port@0 {
reg = <0>;
label = "lan3";
phy-mode = "rmii";
phy-handle = <&phy0>;
};
port@1 {
reg = <1>;
label = "lan4";
phy-mode = "rmii";
phy-handle = <&phy1>;
};
port@2 {
reg = <2>;
label = "lan2";
phy-mode = "internal";
phy-handle = <&phy11>;
};
port@4 {
reg = <4>;
label = "lan1";
phy-mode = "internal";
phy-handle = <&phy13>;
};
};
&pcie0 {
status = "okay";

2
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
View File

@ -215,7 +215,7 @@
qca,no-eeprom;
qca,disable-5ghz;
mtd-mac-address = <&ath9k_cal 0xf100>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};
};
};

2
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
View File

@ -203,7 +203,7 @@
big-endian;
ieee80211-freq-limit = <5000000 6000000>;
mtd-mac-address = <&romfile 0xf100>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};
};
};

2
target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
View File

@ -177,7 +177,7 @@
phy-handle = <&phy1>;
phy-connection-type = "rgmii-id";
mtd-mac-address = <&hwinfo 0>;
mac-address-increment = <1>;
mtd-mac-address-increment = <1>;
};
gpio0: gpio-controller@fc00 {

6
target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
View File

@ -181,7 +181,7 @@
phy-mode = "sgmii";
phy-handle = <&phy5>;
mtd-mac-address = <&eeprom 0>;
mac-address-increment = <(1)>;
mtd-mac-address-increment = <(1)>;
};
ethernet@2 {
@ -190,7 +190,7 @@
phy-mode = "sgmii";
phy-handle = <&phy6>;
mtd-mac-address = <&eeprom 0>;
mac-address-increment = <(2)>;
mtd-mac-address-increment = <(2)>;
};
ethernet@3 {
@ -199,7 +199,7 @@
phy-mode = "sgmii";
phy-handle = <&phy7>;
mtd-mac-address = <&eeprom 0>;
mac-address-increment = <(3)>;
mtd-mac-address-increment = <(3)>;
};
};
};

2
target/linux/ramips/dts/mt7620a_cameo_810.dtsi
View File

@ -154,6 +154,6 @@
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
mtd-mac-address = <&factory 0x28>;
mac-address-increment = <2>;
mtd-mac-address-increment = <2>;
};
};

2
target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
View File

@ -115,7 +115,7 @@
mt76x0e@0,0 {
reg = <0x0000 0 0 0 0>;
mtd-mac-address = <&config 0xe490>;
mac-address-increment = <(2)>;
mtd-mac-address-increment = <(2)>;
mediatek,mtd-eeprom = <&config 0xe05d>;
};
};

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