[Buildroot] [PATCH 1/1] board/acmesystems/acqua-a5: update device tree for newer kernels

[Buildroot] [PATCH 1/1] board/acmesystems/acqua-a5: update device tree for newer kernels

[Edgar Bonet]

The Ethernet MAC address of the Acqua board is stored in an onboard
EEPROM. Its location is described in the device tree as:

        eeprom@58 {  // NVMEM node
                // EEPROM parameters...

                eth0_addr: eth-mac-addr@9A {  // NVMEM cells
                        reg = <0x0 0x06>;
                };
        };

Since Linux 6.5, defining NVMEM cells this way, as direct children of
the NVMEM node, is deprecated. It is instead recommended to wrap the
cells inside a "fixed-layout" node.

The older, deprecated syntax is still supported on Linux 6.6. Since
Linux 6.7 (commit 2cc3b37f5b6d: "nvmem: add explicit config option to
read old syntax fixed OF cells") however, it is only supported by
selected NVMEM drivers. It is not supported by the at24 driver used to
access the Acqua's onboard EEPROM.

Update the device tree to the new, recommended, syntax. This makes it
work with newer kernels, while preserving compatibility with the
currently used 6.6.30.

Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
---
 board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts
index a7a4a20352..411d1942f5 100644
--- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts
+++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts
@@ -149,8 +149,14 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
-					eth0_addr: eth-mac-addr@9A {
-						reg = <0x0 0x06>;
+					nvmem-layout {
+						compatible = "fixed-layout";
+						#address-cells = <1>;
+						#size-cells = <1>;
+
+						eth0_addr: eth-mac-addr@9A {
+							reg = <0x0 0x06>;
+						};
 					};
 				};
 				
-- 
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] board/acmesystems/acqua-a5: update device tree for newer kernels

[Thomas Petazzoni via buildroot]

On Mon, 23 Sep 2024 12:28:51 +0200
Edgar Bonet <bonet@grenoble.cnrs.fr> wrote:

> The Ethernet MAC address of the Acqua board is stored in an onboard
> EEPROM. Its location is described in the device tree as:
> 
>         eeprom@58 {  // NVMEM node
>                 // EEPROM parameters...
> 
>                 eth0_addr: eth-mac-addr@9A {  // NVMEM cells
>                         reg = <0x0 0x06>;
>                 };
>         };
> 
> Since Linux 6.5, defining NVMEM cells this way, as direct children of
> the NVMEM node, is deprecated. It is instead recommended to wrap the
> cells inside a "fixed-layout" node.
> 
> The older, deprecated syntax is still supported on Linux 6.6. Since
> Linux 6.7 (commit 2cc3b37f5b6d: "nvmem: add explicit config option to
> read old syntax fixed OF cells") however, it is only supported by
> selected NVMEM drivers. It is not supported by the at24 driver used to
> access the Acqua's onboard EEPROM.
> 
> Update the device tree to the new, recommended, syntax. This makes it
> work with newer kernels, while preserving compatibility with the
> currently used 6.6.30.
> 
> Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
> ---
>  board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot