| Message ID | 20230728112805.20769-1-zajec5@gmail.com |
|---|---|
| State | Handled Elsewhere |
| Delegated to: | Rafał Miłecki |
| Headers | show |
| Series | mediatek: filogic: use fixed layout cell "mac-base" for Xiaomi WR30U | expand |
On 28.07.2023 13:28, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > Cc: Hank Moretti <mchank9999@gmail.com> > Cc: Hauke Mehrtens <hauke@hauke-m.de> > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > Hank: can you runtime test this, please? It remained unanswered but change got handled by Rosen: 405bc5be130a ("mediatek: convert to nvmem-layout") 3eb899fd3675 ("mediatek: use mac-base") > --- > .../dts/mt7981b-xiaomi-mi-router-wr30u.dtsi | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi > index 9467b18a7e..4f8c3046d2 100644 > --- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi > +++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi > @@ -73,9 +73,8 @@ > reg = <0>; > phy-mode = "2500base-x"; > > - nvmem-cells = <&macaddr_factory_4>; > + nvmem-cells = <&macaddr_factory_4 (-1)>; > nvmem-cell-names = "mac-address"; > - mac-address-increment = <(-1)>; > > fixed-link { > speed = <2500>; > @@ -177,12 +176,16 @@ > reg = <0x180000 0x200000>; > read-only; > > - compatible = "nvmem-cells"; > - #address-cells = <1>; > - #size-cells = <1>; > + nvmem-layout { > + compatible = "fixed-layout"; > + #address-cells = <1>; > + #size-cells = <1>; > > - macaddr_factory_4: macaddr@4 { > - reg = <0x4 0x6>; > + macaddr_factory_4: macaddr@4 { > + compatible = "mac-base"; > + reg = <0x4 0x6>; > + #nvmem-cell-cells = <1>; > + }; > }; > }; >
diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi index 9467b18a7e..4f8c3046d2 100644 --- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi +++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi @@ -73,9 +73,8 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_factory_4>; + nvmem-cells = <&macaddr_factory_4 (-1)>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(-1)>; fixed-link { speed = <2500>; @@ -177,12 +176,16 @@ reg = <0x180000 0x200000>; read-only; - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; - macaddr_factory_4: macaddr@4 { - reg = <0x4 0x6>; + macaddr_factory_4: macaddr@4 { + compatible = "mac-base"; + reg = <0x4 0x6>; + #nvmem-cell-cells = <1>; + }; }; };