lantiq: use the etop driver DT bindings only

Use the generic mtd-mac-address dts property to get a mac address from
flash instead of the lantiq specific one.

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 c75637c19734ef14cf26ddcce13f896ecd0ec016..2145d074b3e13e42f8e0fb14c9b17c2a7475e557 100644 (file)
--- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -76,11 +76,6 @@
                                lantiq,shadow = <0x0>;
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                       };
-
                        ath5k_eep {
                                compatible = "ath5k,eeprom";
                                ath,eep-flash = <&boardconfig 0x400>;
@@ -117,6 +112,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                ifxhcd@E101000 {

diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts
index d6b6da3ee8989cd7f3f7b3a4e99aebfcf6c031dd..f1e61766dbafb9ca2be7a3108311976d65b8cfb4 100644 (file)
--- a/target/linux/lantiq/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/dts/ARV4519PW.dts
@@ -61,7 +61,7 @@
                                                reg = <0x20000 0x3d0000>;
                                        };
 
-                                       partition@3f0000 {
+                                       boardconfig: partition@3f0000 {
                                                label = "boardconfig";
                                                reg = <0x3f0000 0x10000>;
                                                read-only;
@@ -78,11 +78,6 @@
                                gpio-controller;
                                lantiq,shadow = <0x400>;
                        };
-
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                       };
                };
 
                gpio: pinmux@E100B10 {
@@ -99,6 +94,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                ifxhcd@E101000 {

diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts
index 585292e2d5b1a4c5c687b016790734f0e143d861..a7d529bc63086c02aeaeaca667cd7bb6870e25f4 100644 (file)
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -63,7 +63,7 @@
                                                reg = <0x30000 0x3c0000>;
                                        };
 
-                                       partition@7f0000 {
+                                       boardconfig: partition@7f0000 {
                                                label = "boardconfig";
                                                reg = <0x3f0000 0x10000>;
                                                read-only;
@@ -71,11 +71,6 @@
                                };
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                       };
-
                        gpiomm: gpiomm@4000000 {
                                compatible = "lantiq,gpio-mm";
                                reg = <1 0x0 0x10 >;
@@ -118,6 +113,7 @@
 
                etop@E180000 {
                        phy-mode = "rmii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                ifxhcd@E101000 {

diff --git a/target/linux/lantiq/dts/ARV4525PW.dts b/target/linux/lantiq/dts/ARV4525PW.dts
index d66e087b088076c23113c7589da02dde650db11b..5d2c3272084de2203aaee8750f216c4bf659277c 100644 (file)
--- a/target/linux/lantiq/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/dts/ARV4525PW.dts
@@ -67,11 +67,6 @@
                                };
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                       };
-
                        ath5k_eep {
                                compatible = "ath5k,eeprom";
                                ath,eep-flash = <&boardconfig 0x400>;
@@ -111,6 +106,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts
index 3c7539651dde7129563d430266ab45809950e86d..152b7af992d25dfacd100c24653cad474f979299 100644 (file)
--- a/target/linux/lantiq/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/dts/ARV452CQW.dts
@@ -70,11 +70,6 @@
                                };
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                       };
-
                        ath5k_eep {
                                compatible = "ath5k,eeprom";
                                ath,eep-flash = <&boardconfig 0x400>;
@@ -132,6 +127,7 @@
 
                etop@E180000 {
                        phy-mode = "rmii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/ARV7506PW11.dts b/target/linux/lantiq/dts/ARV7506PW11.dts
index 7519e22408478c7399893dad7c7d7c5e7eae657e..14630450fee509ba56ce516ac16d863f4ae2841f 100644 (file)
--- a/target/linux/lantiq/dts/ARV7506PW11.dts
+++ b/target/linux/lantiq/dts/ARV7506PW11.dts
@@ -50,18 +50,13 @@
                                                reg = <0x50000 0x7a0000>;
                                        };
 
-                                       partition@7f0000 {
+                                       boardconfig: partition@7f0000 {
                                                label = "board_config";
                                                reg = <0x7f0000 0x10000>;
                                                read-only;
                                        };
                                };
                        };
-
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x7f0016 0x6>;
-                       };
                };
 
                gpio: pinmux@E100B10 {
@@ -85,6 +80,7 @@
                /* GPIO 19: switch reset */
                etop@E180000 {
                        phy-mode = "rmii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts
index 7a30ef3ff89f3fa8a27ff21010cbb0f909ff9a78..fb03017f1dd5e6bea4b674008509e67fd555b7ef 100644 (file)
--- a/target/linux/lantiq/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/dts/ARV7510PW22.dts
@@ -60,18 +60,13 @@
                                                reg = <0x60000 0xf80000>;
                                        };
 
-                                       partition@fe0000 {
+                                       boardconfig: partition@fe0000 {
                                                label = "board_config";
                                                reg = <0xfe0000 0x20000>;
                                                read-only;
                                        };
                                };
                        };
-
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0xfe0016 0x6>;
-                       };
                };
 
                gpio: pinmux@E100B10 {
@@ -121,8 +116,9 @@
                };
 
                etop@E180000 {
-                       phy-mode = "mii";
                        /* Switch reset 19 */
+                       phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts
index 0b9129c4c39283514cbfdb3fdee0231906908326..6e2b8ef6d3cccdf727128b5ca0df71b6287821f7 100644 (file)
--- a/target/linux/lantiq/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/dts/ARV7518PW.dts
@@ -78,11 +78,6 @@
                                lantiq,shadow = <0x0>;
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x7f0016 0x6>;
-                       };
-
                        ath9k_eep {
                                compatible = "ath9k,eeprom";
                                ath,eep-flash = <&boardconfig 0x400>;
@@ -135,6 +130,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                ifxhcd@E101000 {

diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts
index abd865726b522b962ec583db92ba6548f598fe2d..b6e04d69dafde07fe17d39c3ecaba50fd258dba2 100644 (file)
--- a/target/linux/lantiq/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/dts/ARV7519PW.dts
@@ -59,18 +59,13 @@
                                                reg = <0x60000 0xf80000>;
                                        };
 
-                                       partition@fe0000 {
+                                       boardconfig: partition@fe0000 {
                                                label = "board_config";
                                                reg = <0xfe0000 0x20000>;
                                                read-only;
                                        };
                                };
                        };
-
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0xfe0016 0x6>;
-                       };
                };
 
                gpio: pinmux@E100B10 {
@@ -110,6 +105,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                /* warning: passive port

diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts
index 52713a2b25a975e3fc582baa4fbbdf81b32aab34..be1bf755a4837b82fbeed2f47ade7be775339e5b 100644 (file)
--- a/target/linux/lantiq/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/dts/ARV7525PW.dts
@@ -61,7 +61,7 @@
                                                reg = <0x20000 0x3d0000>;
                                        };
 
-                                       partition@400000 {
+                                       boardconfig: partition@400000 {
                                                label = "board_config";
                                                reg = <0x3f0000 0x10000>;
                                                read-only;
@@ -69,11 +69,6 @@
                                };
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x3f0016 0x6>;
-                       };
-
                        ralink_eep {
                                compatible = "ralink,eeprom";
                                ralink,eeprom = "RT2860.eeprom";
@@ -99,6 +94,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts
index 8c148b489de6e4804a25a17f7b14de3b60ad30d9..a54e15cb1aa0c9ac290497cefa6ea803e5697462 100644 (file)
--- a/target/linux/lantiq/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/dts/ARV752DPW.dts
@@ -60,7 +60,7 @@
                                                reg = <0x20000 0x7d0000>;
                                        };
 
-                                       partition@7f0000 {
+                                       boardconfig: partition@7f0000 {
                                                label = "board_config";
                                                reg = <0x7f0000 0x10000>;
                                                read-only;
@@ -68,11 +68,6 @@
                                };
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x7f0016 0x6>;
-                       };
-
                        gpiomm: gpiomm@4000000 {
                                compatible = "lantiq,gpio-mm";
                                reg = <1 0x0 0x10 >;
@@ -137,6 +132,7 @@
 
                etop@E180000 {
                        phy-mode = "rmii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts
index 2b95ae5c7460e5c02b24b9782cc812988a5edca8..d7103fbd22e894fd1006652ac051434fcfc8aafc 100644 (file)
--- a/target/linux/lantiq/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/dts/ARV752DPW22.dts
@@ -60,7 +60,7 @@
                                                reg = <0x40000 0x7b0000>;
                                        };
 
-                                       partition@7f0000 {
+                                       boardconfig: partition@7f0000 {
                                                label = "board_config";
                                                reg = <0x7f0000 0x10000>;
                                                read-only;
@@ -68,11 +68,6 @@
                                };
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x7f0016 0x6>;
-                       };
-
                        gpiomm: gpiomm@4000000 {
                                compatible = "lantiq,gpio-mm";
                                reg = <1 0x0 0x10 >;
@@ -136,6 +131,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&boardconfig 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/dts/ARV8539PW22.dts
index b3ea02fd0c9dc9bd790d929ce26a601d47bb2de3..8a6a07b274925225806aa3613cbc252ebe06e6c2 100644 (file)
--- a/target/linux/lantiq/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/dts/ARV8539PW22.dts
@@ -67,11 +67,6 @@
                                };
                        };
 
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x7f0016 0x6>;
-                       };
-
                        ath9k_eep {
                                compatible = "ath9k,eeprom";
                                ath,eep-flash = <&art 0x400>;
@@ -114,6 +109,7 @@
 
                etop@E180000 {
                        phy-mode = "mii";
+                       mtd-mac-address = <&art 0x16>;
                };
 
                pci@E105400 {

diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts
index 5b4740ca86ea30aedc915e1082d90e6c42f357c8..ba48dd13ec3ea4771099e1cf3e43699583743e9c 100644 (file)
--- a/target/linux/lantiq/dts/WBMR.dts
+++ b/target/linux/lantiq/dts/WBMR.dts
@@ -55,24 +55,19 @@
                                                reg = <0x60000 0x1f20000>;
                                        };
 
-                                       partition@0x1fc0000 {
+                                       boardconfig: partition@1fc0000 {
                                                label = "board";
                                                reg = <0x1fc0000 0x20000>;
                                                read-only;
                                        };
 
-                                       partition@0x1fe0000 {
+                                       partition@1fe0000 {
                                                label = "calibration";
                                                reg = <0x1fe0000 0x20000>;
                                                read-only;
                                        };
                                };
                        };
-
-                       mac_addr {
-                               compatible = "lantiq,eth-mac";
-                               reg = <0 0x1fd0024 0x6>;
-                       };
                };
 
                gpio: pinmux@E100B10 {
@@ -101,6 +96,7 @@
 
                etop@E180000 {
                        phy-mode = "rgmii";
+                       mtd-mac-address = <&boardconfig 0x10024>;
                };
 
                ifxhcd@E101000 {