From: Mathias Kresin <dev@kresin.me>
Date: Tue, 2 Aug 2016 20:26:00 +0000 (+0200)
Subject: lantiq: fix mac address increments
X-Git-Tag: v19.07.0-rc1~9381
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1b7d6583a5ed9a2c31045107ab51b00b24109c5b;p=openwrt%2Fstaging%2Fhauke.git

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 4034b157f6..c75637c197 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 299d13c4d4..585292e2d5 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 9d27278d0b..d66e087b08 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 bbddf2c955..3c7539651d 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 16b4fb4270..7a30ef3ff8 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 380ba15172..0b9129c4c3 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 b917b2d93e..abd865726b 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 62ae62b99e..52713a2b25 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 d4b5767654..8c148b489d 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 efe425787d..2b95ae5c74 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 6189b54861..b3ea02fd0c 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 634b29679a..59c678d709 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;