lantiq: fix mac address increments

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 <dev@kresin.me>

diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
index 4034b157f68fb4a223a43c62bf3e4c9a1e35bb60..c75637c19734ef14cf26ddcce13f896ecd0ec016 100644 (file)
--- 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 299d13c4d4408fa5d868cf2c270db7d970cc8d08..585292e2d5b1a4c5c687b016790734f0e143d861 100644 (file)
--- 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 9d27278d0b25c0a2eb40cba1b622713448e06305..d66e087b088076c23113c7589da02dde650db11b 100644 (file)
--- 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 bbddf2c955dbcdc4c432a3e7632d0098e1b08b47..3c7539651dde7129563d430266ab45809950e86d 100644 (file)
--- 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 16b4fb4270b1ec5f7b0589d27983f9d7fa56c253..7a30ef3ff89f3fa8a27ff21010cbb0f909ff9a78 100644 (file)
--- 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 380ba151721847709634ebb5bd973df8faf42189..0b9129c4c39283514cbfdb3fdee0231906908326 100644 (file)
--- 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 b917b2d93e05655bc97b808b8e11381632d7626b..abd865726b522b962ec583db92ba6548f598fe2d 100644 (file)
--- 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 62ae62b99e26951d773a06b09baf9661bee25705..52713a2b25a975e3fc582baa4fbbdf81b32aab34 100644 (file)
--- 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 d4b576765494d90a5c1d89c0bbfce53d603f3cc8..8c148b489de6e4804a25a17f7b14de3b60ad30d9 100644 (file)
--- 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 efe425787dfcc76e43dcfdec6d8cb3261b66f6e4..2b95ae5c7460e5c02b24b9782cc812988a5edca8 100644 (file)
--- 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 6189b5486134402aa5ae5ad5896f8ce991e8ea5f..b3ea02fd0c9dc9bd790d929ce26a601d47bb2de3 100644 (file)
--- 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 634b29679a8f9847e798e797f156f8729b0a89fe..59c678d709d83308699b65c871c070e7eb495472 100644 (file)
--- 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;