diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-08-20 14:42:56 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-08-20 18:13:55 +0200 |
| commit | 05ccca031e1654d5cdff912dd7276cca40d37e44 (patch) | |
| tree | 9fbe1838e99931cc57e905d533532db90dd8be08 /target/linux/mediatek/patches-5.10 | |
| parent | adb3e46616c69472964bfc0763ff622f468cb2ff (diff) | |
| download | upstream-05ccca031e1654d5cdff912dd7276cca40d37e44.tar.gz upstream-05ccca031e1654d5cdff912dd7276cca40d37e44.tar.bz2 upstream-05ccca031e1654d5cdff912dd7276cca40d37e44.zip | |
mediatek: convert mtd-mac-address to nvmem for MT7629 RFB
This conversion appears to have been overlooked since it's in a
kernel patch.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/mediatek/patches-5.10')
3 files changed, 33 insertions, 10 deletions
diff --git a/target/linux/mediatek/patches-5.10/101-dts-update-mt7629-rfb.patch b/target/linux/mediatek/patches-5.10/101-dts-update-mt7629-rfb.patch index 8d3e283315..254b5f9eb7 100644 --- a/target/linux/mediatek/patches-5.10/101-dts-update-mt7629-rfb.patch +++ b/target/linux/mediatek/patches-5.10/101-dts-update-mt7629-rfb.patch @@ -8,23 +8,28 @@ }; gpio-keys { -@@ -69,6 +70,7 @@ - gmac0: mac@0 { +@@ -70,6 +71,10 @@ compatible = "mediatek,eth-mac"; reg = <0>; -+ mtd-mac-address = <&factory 0x2a>; phy-mode = "2500base-x"; ++ ++ nvmem-cells = <&macaddr_factory_2a>; ++ nvmem-cell-names = "mac-address"; ++ fixed-link { speed = <2500>; -@@ -80,6 +82,7 @@ - gmac1: mac@1 { - compatible = "mediatek,eth-mac"; + full-duplex; +@@ -82,6 +87,9 @@ reg = <1>; -+ mtd-mac-address = <&factory 0x24>; phy-mode = "gmii"; phy-handle = <&phy0>; ++ ++ nvmem-cells = <&macaddr_factory_24>; ++ nvmem-cell-names = "mac-address"; }; -@@ -133,8 +136,9 @@ + + mdio: mdio-bus { +@@ -133,8 +141,9 @@ }; partition@b0000 { @@ -35,3 +40,21 @@ }; }; }; +@@ -272,3 +281,17 @@ + pinctrl-0 = <&watchdog_pins>; + status = "okay"; + }; ++ ++&factory { ++ compatible = "nvmem-cells"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ macaddr_factory_24: macaddr@24 { ++ reg = <0x24 0x6>; ++ }; ++ ++ macaddr_factory_2a: macaddr@2a { ++ reg = <0x2a 0x6>; ++ }; ++}; diff --git a/target/linux/mediatek/patches-5.10/130-dts-mt7629-add-snand-support.patch b/target/linux/mediatek/patches-5.10/130-dts-mt7629-add-snand-support.patch index 479694b400..8febc65d1b 100644 --- a/target/linux/mediatek/patches-5.10/130-dts-mt7629-add-snand-support.patch +++ b/target/linux/mediatek/patches-5.10/130-dts-mt7629-add-snand-support.patch @@ -42,7 +42,7 @@ Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com> "mediatek,mt7622-spi"; --- a/arch/arm/boot/dts/mt7629-rfb.dts +++ b/arch/arm/boot/dts/mt7629-rfb.dts -@@ -249,6 +249,52 @@ +@@ -254,6 +254,52 @@ }; }; diff --git a/target/linux/mediatek/patches-5.10/603-ARM-dts-mediatek-Update-mt7629-PCIe-node.patch b/target/linux/mediatek/patches-5.10/603-ARM-dts-mediatek-Update-mt7629-PCIe-node.patch index 799cc31ab7..252ef080f5 100644 --- a/target/linux/mediatek/patches-5.10/603-ARM-dts-mediatek-Update-mt7629-PCIe-node.patch +++ b/target/linux/mediatek/patches-5.10/603-ARM-dts-mediatek-Update-mt7629-PCIe-node.patch @@ -135,7 +135,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com> --- a/arch/arm/boot/dts/mt7629-rfb.dts +++ b/arch/arm/boot/dts/mt7629-rfb.dts -@@ -144,9 +144,10 @@ +@@ -149,9 +149,10 @@ }; }; |