From adb3e46616c69472964bfc0763ff622f468cb2ff Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 20 Aug 2021 14:27:13 +0200 Subject: [PATCH] lantiq: convert mtd-mac-address to nvmem for Fritz!Box 736x Convert this series by moving the definitions to the individual devices. Signed-off-by: Adrian Schmutzler --- .../boot/dts/lantiq/vr9_avm_fritz7360-v2.dts | 16 ++++++++++++++++ .../mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts | 16 ++++++++++++++++ .../mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts | 16 ++++++++++++++++ .../mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi | 5 ----- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts index 3bd6ff0ee73b..888174581955 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts @@ -51,3 +51,19 @@ }; }; }; + +ð0 { + nvmem-cells = <&macaddr_urlader_a91>; + nvmem-cell-names = "mac-address"; + mac-address-increment = <(-2)>; +}; + +&urlader { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_urlader_a91: macaddr@a91 { + reg = <0xa91 0x6>; + }; +}; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts index 898ca00c34ac..945c553688bc 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts @@ -51,3 +51,19 @@ }; }; }; + +ð0 { + nvmem-cells = <&macaddr_urlader_a91>; + nvmem-cell-names = "mac-address"; + mac-address-increment = <(-2)>; +}; + +&urlader { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_urlader_a91: macaddr@a91 { + reg = <0xa91 0x6>; + }; +}; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts index c26908642cfe..b1423e5dea4c 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts @@ -83,3 +83,19 @@ #address-cells = <2>; }; }; + +ð0 { + nvmem-cells = <&macaddr_urlader_a91>; + nvmem-cell-names = "mac-address"; + mac-address-increment = <(-2)>; +}; + +&urlader { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_urlader_a91: macaddr@a91 { + reg = <0xa91 0x6>; + }; +}; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi index d91dc74e2f0a..83ef4154236a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi @@ -80,11 +80,6 @@ }; }; -ð0 { - mtd-mac-address = <&urlader 0xa91>; - mac-address-increment = <(-2)>; -}; - &gphy0 { lantiq,gphy-mode = ; }; -- 2.30.2