ARM: dts: omap: am335x-bone: convert NVMEM content to layout syntax

Use cleaner (and non-deprecated) bindings syntax. See commit
bd912c991d2e ("dt-bindings: nvmem: layouts: add fixed-layout") for
details.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20240523042750.26238-1-zajec5@gmail.com
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
index 2ba911fd916211f78aaa81e872e18b140610a9d3..a0fb431aec8411d85804b7f8822f0d9ef1bfdf56 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
@@ -221,10 +221,14 @@
                reg = <0x50>;
                vcc-supply = <&ldo4_reg>;
 
-               #address-cells = <1>;
-               #size-cells = <1>;
-               baseboard_data: baseboard_data@0 {
-                       reg = <0 0x100>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       baseboard_data: baseboard_data@0 {
+                               reg = <0 0x100>;
+                       };
                };
        };
 };
@@ -239,40 +243,60 @@
        cape_eeprom0: cape_eeprom0@54 {
                compatible = "atmel,24c256";
                reg = <0x54>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               cape0_data: cape_data@0 {
-                       reg = <0 0x100>;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cape0_data: cape_data@0 {
+                               reg = <0 0x100>;
+                       };
                };
        };
 
        cape_eeprom1: cape_eeprom1@55 {
                compatible = "atmel,24c256";
                reg = <0x55>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               cape1_data: cape_data@0 {
-                       reg = <0 0x100>;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cape1_data: cape_data@0 {
+                               reg = <0 0x100>;
+                       };
                };
        };
 
        cape_eeprom2: cape_eeprom2@56 {
                compatible = "atmel,24c256";
                reg = <0x56>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               cape2_data: cape_data@0 {
-                       reg = <0 0x100>;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cape2_data: cape_data@0 {
+                               reg = <0 0x100>;
+                       };
                };
        };
 
        cape_eeprom3: cape_eeprom3@57 {
                compatible = "atmel,24c256";
                reg = <0x57>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               cape3_data: cape_data@0 {
-                       reg = <0 0x100>;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cape3_data: cape_data@0 {
+                               reg = <0 0x100>;
+                       };
                };
        };
 };

diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
index 801399702547d0b0512271d0964626534c1914a1..8878da773d679017a6b409981c16105ac69a6cbc 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
@@ -317,10 +317,14 @@
                compatible = "atmel,24c256";
                reg = <0x50>;
 
-               #address-cells = <1>;
-               #size-cells = <1>;
-               baseboard_data: baseboard_data@0 {
-                       reg = <0 0x100>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       baseboard_data: baseboard_data@0 {
+                               reg = <0 0x100>;
+                       };
                };
        };
 };