| Message ID | 20240524125617.27714-1-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: allwinner: convert NanoPi R1S H5 NVMEM content to layout syntax | expand |
On Fri, 24 May 2024 14:56:17 +0200 Rafał Miłecki <zajec5@gmail.com> wrote: Hi Rafał, > From: Rafał Miłecki <rafal@milecki.pl> > > Use cleaner (and non-deprecated) bindings syntax. See commit > bd912c991d2e ("dt-bindings: nvmem: layouts: add fixed-layout") for > details. Is there anything that this commit fixes, or is it just "nicer"? If I see this correctly, then this commit would break with older kernels, or more precisely anything that doesn't support the "fixed-layout" compatible string, right? For sunxi we try to keep the DTs compatible both ways, so that the latest DT (as imported in U-Boot, for instance), can run with both older stable and the newest kernels. Cheers, Andre > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts > index 3a7ee44708a2..36e46e40b8f8 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts > @@ -146,11 +146,15 @@ eeprom@51 { > reg = <0x51>; > pagesize = <16>; > read-only; > - #address-cells = <1>; > - #size-cells = <1>; > > - eth_mac1: mac-address@fa { > - reg = <0xfa 0x06>; > + nvmem-layout { > + compatible = "fixed-layout"; > + #address-cells = <1>; > + #size-cells = <1>; > + > + eth_mac1: mac-address@fa { > + reg = <0xfa 0x06>; > + }; > }; > }; > };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts index 3a7ee44708a2..36e46e40b8f8 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts @@ -146,11 +146,15 @@ eeprom@51 { reg = <0x51>; pagesize = <16>; read-only; - #address-cells = <1>; - #size-cells = <1>; - eth_mac1: mac-address@fa { - reg = <0xfa 0x06>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eth_mac1: mac-address@fa { + reg = <0xfa 0x06>; + }; }; }; };