diff mbox series

[1/3] dt-bindings: nvmem: convert U-Boot env to NVMEM layout

Message ID 20230718160652.26756-1-zajec5@gmail.com
State New
Headers
Series [1/3] dt-bindings: nvmem: convert U-Boot env to NVMEM layout |

Commit Message

Rafał Miłecki July 18, 2023, 4:06 p.m. UTC 
  From: Rafał Miłecki <rafal@milecki.pl>

Use "nvmem-layout" and drop unused "mac" label while at it.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 .../bindings/nvmem/layouts/nvmem-layout.yaml    |  1 +
 .../nvmem/{ => layouts}/u-boot,env.yaml         | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)
 rename Documentation/devicetree/bindings/nvmem/{ => layouts}/u-boot,env.yaml (87%)

Comments

Conor Dooley July 19, 2023, 4:19 p.m. UTC | #1 
On Tue, Jul 18, 2023 at 06:06:50PM +0200, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> Use "nvmem-layout" and drop unused "mac" label while at it.

Stupid question perhaps, does the "old" way of doing this still work
after this series?

Thanks
Conor.

> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
>  .../bindings/nvmem/layouts/nvmem-layout.yaml    |  1 +
>  .../nvmem/{ => layouts}/u-boot,env.yaml         | 17 +++++++++++------
>  2 files changed, 12 insertions(+), 6 deletions(-)
>  rename Documentation/devicetree/bindings/nvmem/{ => layouts}/u-boot,env.yaml (87%)
> 
> diff --git a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml
> index 3b40f7880774..382507060651 100644
> --- a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml
> +++ b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml
> @@ -21,6 +21,7 @@ oneOf:
>    - $ref: fixed-layout.yaml
>    - $ref: kontron,sl28-vpd.yaml
>    - $ref: onie,tlv-layout.yaml
> +  - $ref: u-boot,env.yaml
>  
>  properties:
>    compatible: true
> diff --git a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml b/Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml
> similarity index 87%
> rename from Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
> rename to Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml
> index 36d97fb87865..ebe3b71ba155 100644
> --- a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
> +++ b/Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml
> @@ -1,7 +1,7 @@
>  # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
>  %YAML 1.2
>  ---
> -$id: http://devicetree.org/schemas/nvmem/u-boot,env.yaml#
> +$id: http://devicetree.org/schemas/nvmem/layouts/u-boot,env.yaml#
>  $schema: http://devicetree.org/meta-schemas/core.yaml#
>  
>  title: U-Boot environment variables
> @@ -72,11 +72,14 @@ examples:
>          };
>  
>          env: partition@40000 {
> -            compatible = "u-boot,env";
>              reg = <0x40000 0x10000>;
>  
> -            mac: ethaddr {
> -                #nvmem-cell-cells = <1>;
> +            nvmem-layout {
> +                compatible = "u-boot,env";
> +
> +                ethaddr {
> +                    #nvmem-cell-cells = <1>;
> +                };
>              };
>          };
>      };
> @@ -92,9 +95,11 @@ examples:
>              label = "u-boot";
>  
>              partition-u-boot-env {
> -                compatible = "brcm,env";
> +                nvmem-layout {
> +                    compatible = "brcm,env";
>  
> -                ethaddr {
> +                    ethaddr {
> +                    };
>                  };
>              };
>          };
> -- 
> 2.35.3
>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml
index 3b40f7880774..382507060651 100644
--- a/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml
+++ b/Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml
@@ -21,6 +21,7 @@  oneOf:
   - $ref: fixed-layout.yaml
   - $ref: kontron,sl28-vpd.yaml
   - $ref: onie,tlv-layout.yaml
+  - $ref: u-boot,env.yaml
 
 properties:
   compatible: true
diff --git a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml b/Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml
similarity index 87%
rename from Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
rename to Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml
index 36d97fb87865..ebe3b71ba155 100644
--- a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
+++ b/Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/nvmem/u-boot,env.yaml#
+$id: http://devicetree.org/schemas/nvmem/layouts/u-boot,env.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: U-Boot environment variables
@@ -72,11 +72,14 @@  examples:
         };
 
         env: partition@40000 {
-            compatible = "u-boot,env";
             reg = <0x40000 0x10000>;
 
-            mac: ethaddr {
-                #nvmem-cell-cells = <1>;
+            nvmem-layout {
+                compatible = "u-boot,env";
+
+                ethaddr {
+                    #nvmem-cell-cells = <1>;
+                };
             };
         };
     };
@@ -92,9 +95,11 @@  examples:
             label = "u-boot";
 
             partition-u-boot-env {
-                compatible = "brcm,env";
+                nvmem-layout {
+                    compatible = "brcm,env";
 
-                ethaddr {
+                    ethaddr {
+                    };
                 };
             };
         };