diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-04-02 23:53:02 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2021-07-19 14:51:22 +0200 |
| commit | 1e6f330ccfa91f8a6860cfc768299490e3c08603 (patch) | |
| tree | 7e7a3374975e737177d7258b872b3c84a65d80e8 /target/linux | |
| parent | 8ec21d6bb2101d801f1ee915d1cd0412c6585078 (diff) | |
| download | upstream-1e6f330ccfa91f8a6860cfc768299490e3c08603.tar.gz upstream-1e6f330ccfa91f8a6860cfc768299490e3c08603.tar.bz2 upstream-1e6f330ccfa91f8a6860cfc768299490e3c08603.zip | |
mediatek: convert mtd-mac-address to nvmem implementation
Define nvmem-cells and convert mtd-mac-address to nvmem implementation.
The conversion is done with an automated script.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux')
5 files changed, 89 insertions, 12 deletions
diff --git a/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts b/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts index 62e2e7f4cb..6d77be532b 100644 --- a/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts +++ b/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts @@ -218,8 +218,9 @@ phy-connection-type = "2500base-x"; - mtd-mac-address = <&factory 0x4>; - mtd-mac-address-increment = <(-1)>; + nvmem-cells = <&macaddr_factory_4>; + nvmem-cell-names = "mac-address"; + mac-address-increment = <(-1)>; fixed-link { speed = <2500>; @@ -337,3 +338,13 @@ &rtc { status = "disabled"; }; + +&factory { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_factory_4: macaddr@4 { + reg = <0x4 0x6>; + }; +}; diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts index d6cadd320c..9df736eb01 100644 --- a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts +++ b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts @@ -53,9 +53,25 @@ }; &gmac0 { - mtd-mac-address = <&factory 0x7fff4>; + nvmem-cells = <&macaddr_factory_7fff4>; + nvmem-cell-names = "mac-address"; }; &wan { - mtd-mac-address = <&factory 0x7fffa>; + nvmem-cells = <&macaddr_factory_7fffa>; + nvmem-cell-names = "mac-address"; +}; + +&factory { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_factory_7fff4: macaddr@7fff4 { + reg = <0x7fff4 0x6>; + }; + + macaddr_factory_7fffa: macaddr@7fffa { + reg = <0x7fffa 0x6>; + }; }; diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450.dts b/target/linux/mediatek/dts/mt7622-linksys-e8450.dts index b30b5d2455..8552dbf1a9 100644 --- a/target/linux/mediatek/dts/mt7622-linksys-e8450.dts +++ b/target/linux/mediatek/dts/mt7622-linksys-e8450.dts @@ -98,9 +98,25 @@ }; &gmac0 { - mtd-mac-address = <&factory 0x7fff4>; + nvmem-cells = <&macaddr_factory_7fff4>; + nvmem-cell-names = "mac-address"; }; &wan { - mtd-mac-address = <&factory 0x7fffa>; + nvmem-cells = <&macaddr_factory_7fffa>; + nvmem-cell-names = "mac-address"; +}; + +&factory { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_factory_7fff4: macaddr@7fff4 { + reg = <0x7fff4 0x6>; + }; + + macaddr_factory_7fffa: macaddr@7fffa { + reg = <0x7fffa 0x6>; + }; }; diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts index b2f741ea3b..e573d30912 100644 --- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts @@ -49,7 +49,8 @@ &wmac { mediatek,mtd-eeprom = <&factory 0x0>; - mtd-mac-address = <&eeprom 0x0>; + nvmem-cells = <&macaddr_eeprom_0>; + nvmem-cell-names = "mac-address"; status = "okay"; }; @@ -57,11 +58,27 @@ wifi@0,0 { reg = <0x0 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x20000>; - mtd-mac-address = <&eeprom 0x6>; + nvmem-cells = <&macaddr_eeprom_6>; + nvmem-cell-names = "mac-address"; ieee80211-freq-limit = <5000000 6000000>; }; }; &gmac0 { - mtd-mac-address = <&eeprom 0x0>; + nvmem-cells = <&macaddr_eeprom_0>; + nvmem-cell-names = "mac-address"; +}; + +&eeprom { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_eeprom_0: macaddr@0 { + reg = <0x0 0x6>; + }; + + macaddr_eeprom_6: macaddr@6 { + reg = <0x6 0x6>; + }; }; diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts index 8603de392a..9b676b43c1 100644 --- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts @@ -65,7 +65,8 @@ &wmac { mediatek,mtd-eeprom = <&factory 0x0>; - mtd-mac-address = <&eeprom 0x0>; + nvmem-cells = <&macaddr_eeprom_0>; + nvmem-cell-names = "mac-address"; status = "okay"; }; @@ -73,11 +74,27 @@ wifi@0,0 { reg = <0x0 0 0 0 0>; mediatek,mtd-eeprom = <&factory 0x20000>; - mtd-mac-address = <&eeprom 0x6>; + nvmem-cells = <&macaddr_eeprom_6>; + nvmem-cell-names = "mac-address"; ieee80211-freq-limit = <5000000 6000000>; }; }; &gmac0 { - mtd-mac-address = <&eeprom 0x0>; + nvmem-cells = <&macaddr_eeprom_0>; + nvmem-cell-names = "mac-address"; +}; + +&eeprom { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_eeprom_0: macaddr@0 { + reg = <0x0 0x6>; + }; + + macaddr_eeprom_6: macaddr@6 { + reg = <0x6 0x6>; + }; }; |