From 91d5067091b56fa757d08ef3e42c53f2f7294ec4 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Tue, 2 Aug 2016 22:26:01 +0200 Subject: [PATCH] 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 --- target/linux/lantiq/dts/ARV4518PWR01.dtsi | 6 +----- target/linux/lantiq/dts/ARV4519PW.dts | 8 ++------ target/linux/lantiq/dts/ARV4520PW.dts | 8 ++------ target/linux/lantiq/dts/ARV4525PW.dts | 6 +----- target/linux/lantiq/dts/ARV452CQW.dts | 6 +----- target/linux/lantiq/dts/ARV7506PW11.dts | 8 ++------ target/linux/lantiq/dts/ARV7510PW22.dts | 10 +++------- target/linux/lantiq/dts/ARV7518PW.dts | 6 +----- target/linux/lantiq/dts/ARV7519PW.dts | 8 ++------ target/linux/lantiq/dts/ARV7525PW.dts | 8 ++------ target/linux/lantiq/dts/ARV752DPW.dts | 8 ++------ target/linux/lantiq/dts/ARV752DPW22.dts | 8 ++------ target/linux/lantiq/dts/ARV8539PW22.dts | 6 +----- target/linux/lantiq/dts/WBMR.dts | 10 +++------- 14 files changed, 25 insertions(+), 81 deletions(-) diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi index c75637c197..2145d074b3 100644 --- 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 d6b6da3ee8..f1e61766db 100644 --- 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 585292e2d5..a7d529bc63 100644 --- 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 d66e087b08..5d2c327208 100644 --- 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 3c7539651d..152b7af992 100644 --- 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 7519e22408..14630450fe 100644 --- 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 7a30ef3ff8..fb03017f1d 100644 --- 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 0b9129c4c3..6e2b8ef6d3 100644 --- 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 abd865726b..b6e04d69da 100644 --- 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 52713a2b25..be1bf755a4 100644 --- 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 8c148b489d..a54e15cb1a 100644 --- 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 2b95ae5c74..d7103fbd22 100644 --- 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 b3ea02fd0c..8a6a07b274 100644 --- 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 5b4740ca86..ba48dd13ec 100644 --- 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 { -- 2.30.2