Use the same mac address increment in device tree source file and
userspace.

Don't add a mac address increment to either the only mtd mac-address or
to all mac-addresses.

Fix a typo in the TDW89X0.dtsi file to add an increment.

Signed-off-by: Mathias Kresin <[email protected]>
---
 target/linux/lantiq/dts/ARV4518PWR01.dtsi | 1 -
 target/linux/lantiq/dts/ARV4520PW.dts     | 1 -
 target/linux/lantiq/dts/ARV4525PW.dts     | 1 -
 target/linux/lantiq/dts/ARV452CQW.dts     | 1 -
 target/linux/lantiq/dts/ARV7510PW22.dts   | 1 -
 target/linux/lantiq/dts/ARV7518PW.dts     | 1 -
 target/linux/lantiq/dts/ARV7519PW.dts     | 1 -
 target/linux/lantiq/dts/ARV7525PW.dts     | 1 -
 target/linux/lantiq/dts/ARV752DPW.dts     | 1 -
 target/linux/lantiq/dts/ARV752DPW22.dts   | 1 -
 target/linux/lantiq/dts/ARV8539PW22.dts   | 1 -
 target/linux/lantiq/dts/TDW89X0.dtsi      | 2 +-
 12 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi 
b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
index 4034b15..c75637c 100644
--- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -79,7 +79,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x3f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        ath5k_eep {
diff --git a/target/linux/lantiq/dts/ARV4520PW.dts 
b/target/linux/lantiq/dts/ARV4520PW.dts
index 299d13c..585292e 100644
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -74,7 +74,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x3f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        gpiomm: gpiomm@4000000 {
diff --git a/target/linux/lantiq/dts/ARV4525PW.dts 
b/target/linux/lantiq/dts/ARV4525PW.dts
index 9d27278..d66e087 100644
--- a/target/linux/lantiq/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/dts/ARV4525PW.dts
@@ -70,7 +70,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x3f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        ath5k_eep {
diff --git a/target/linux/lantiq/dts/ARV452CQW.dts 
b/target/linux/lantiq/dts/ARV452CQW.dts
index bbddf2c..3c75396 100644
--- a/target/linux/lantiq/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/dts/ARV452CQW.dts
@@ -73,7 +73,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x3f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        ath5k_eep {
diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts 
b/target/linux/lantiq/dts/ARV7510PW22.dts
index 16b4fb4..7a30ef3 100644
--- a/target/linux/lantiq/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/dts/ARV7510PW22.dts
@@ -71,7 +71,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0xfe0016 0x6>;
-                               mac-increment = <2>;
                        };
                };
 
diff --git a/target/linux/lantiq/dts/ARV7518PW.dts 
b/target/linux/lantiq/dts/ARV7518PW.dts
index 380ba15..0b9129c 100644
--- a/target/linux/lantiq/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/dts/ARV7518PW.dts
@@ -81,7 +81,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x7f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        ath9k_eep {
diff --git a/target/linux/lantiq/dts/ARV7519PW.dts 
b/target/linux/lantiq/dts/ARV7519PW.dts
index b917b2d..abd8657 100644
--- a/target/linux/lantiq/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/dts/ARV7519PW.dts
@@ -70,7 +70,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0xfe0016 0x6>;
-                               mac-increment = <2>;
                        };
                };
 
diff --git a/target/linux/lantiq/dts/ARV7525PW.dts 
b/target/linux/lantiq/dts/ARV7525PW.dts
index 62ae62b..52713a2 100644
--- a/target/linux/lantiq/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/dts/ARV7525PW.dts
@@ -72,7 +72,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x3f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        ralink_eep {
diff --git a/target/linux/lantiq/dts/ARV752DPW.dts 
b/target/linux/lantiq/dts/ARV752DPW.dts
index d4b5767..8c148b4 100644
--- a/target/linux/lantiq/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/dts/ARV752DPW.dts
@@ -71,7 +71,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x7f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        gpiomm: gpiomm@4000000 {
diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts 
b/target/linux/lantiq/dts/ARV752DPW22.dts
index efe4257..2b95ae5 100644
--- a/target/linux/lantiq/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/dts/ARV752DPW22.dts
@@ -71,7 +71,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x7f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        gpiomm: gpiomm@4000000 {
diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts 
b/target/linux/lantiq/dts/ARV8539PW22.dts
index 6189b54..b3ea02f 100644
--- a/target/linux/lantiq/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/dts/ARV8539PW22.dts
@@ -70,7 +70,6 @@
                        mac_addr {
                                compatible = "lantiq,eth-mac";
                                reg = <0 0x7f0016 0x6>;
-                               mac-increment = <2>;
                        };
 
                        ath9k_eep {
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi 
b/target/linux/lantiq/dts/TDW89X0.dtsi
index 634b296..59c678d 100644
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -85,7 +85,7 @@
                compatible = "ath9k,eeprom";
                ath,eep-flash = <&ath9k_cal 0x21000>;
                ath,mac-offset = <0xf100>;
-               ath,mac-increment;
+               ath,mac-increment = <2>;
                ath,led-pin = <0>;
                ath,disable-5ghz;
                ath,led-active-high;
-- 
2.7.4


_______________________________________________
Lede-dev mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/lede-dev

Reply via email to