Based on commit d8764d347bd7 ("dt-bindings: firmware: xilinx: Describe
soc-nvmem subnode") soc-nvmem should be used instead of simple nvmem that's
why also update example to have it described correctly everywhere.

Fixes: c7f99cd8fb6b ("dt-bindings: nvmem: Convert xlnx,zynqmp-nvmem.txt to yaml")
Signed-off-by: Michal Simek <michal.simek@amd.com>
Acked-by: Rob Herring (Arm) <robh@kernel.org>
---

Changes in v2:
- Fix sha1 in Fixes tag - reported by Stephen

Adding comments from origin version
https://lore.kernel.org/r/42c21f3bcd75f821061d047730dbbcd40233e256.1716800023.git.michal.simek@amd.com

Rob:
 This doesn't seem like an improvement. Is there another nvmem node at
 this level? I would fix the binding instead if not.

Michal:
That name came from discussion with Conor. None suggested to fix dt-schema that's why soc-nvmem has been propagated to DT already and this patch is just fixing last occurrence.

commit d8764d347bd737efec00fae81133ffad0ae084bb (tag: zynqmp-dt-for-6.9)
Author:     Michal Simek <michal.simek@amd.com>
AuthorDate: Wed Jan 31 10:17:28 2024 +0100

    dt-bindings: firmware: xilinx: Describe soc-nvmem subnode

    Describe soc-nvmem subnode as the part of firmware node. The name can't be
    pure nvmem because dt-schema already defines it as array property that's
    why different name should be used.

    Acked-by: Conor Dooley <conor.dooley@microchip.com>
    Link: https://lore.kernel.org/r/24fe6adbf2424360618e8f5ca541ebfd8bb0723e.1706692641.git.michal.simek@amd.com
    Signed-off-by: Michal Simek <michal.simek@amd.com>

---
 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml b/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
index 917c40d5c382..1cbe44ab23b1 100644
--- a/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
+++ b/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
@@ -28,7 +28,7 @@ unevaluatedProperties: false
 
 examples:
   - |
-    nvmem {
+    soc-nvmem {
         compatible = "xlnx,zynqmp-nvmem-fw";
         nvmem-layout {
             compatible = "fixed-layout";
-- 
2.43.0

On Thu, 08 Aug 2024 13:02:59 +0200, Michal Simek wrote:
> Based on commit d8764d347bd7 ("dt-bindings: firmware: xilinx: Describe
> soc-nvmem subnode") soc-nvmem should be used instead of simple nvmem that's
> why also update example to have it described correctly everywhere.
> 
> 

Applied, thanks!

[1/1] dt-bindings: nvmem: Use soc-nvmem node name instead of nvmem
      commit: 972bbba114bd45c7526f88512c277b1a1c4fc3c8

Best regards,
-- 
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

On Thu, Aug 08, 2024 at 01:02:59PM +0200, Michal Simek wrote:
> Based on commit d8764d347bd7 ("dt-bindings: firmware: xilinx: Describe
> soc-nvmem subnode") soc-nvmem should be used instead of simple nvmem that's
> why also update example to have it described correctly everywhere.
> 
> Fixes: c7f99cd8fb6b ("dt-bindings: nvmem: Convert xlnx,zynqmp-nvmem.txt to yaml")
> Signed-off-by: Michal Simek <michal.simek@amd.com>
> Acked-by: Rob Herring (Arm) <robh@kernel.org>
> ---
> 
> Changes in v2:
> - Fix sha1 in Fixes tag - reported by Stephen
> 
> Adding comments from origin version
> https://lore.kernel.org/r/42c21f3bcd75f821061d047730dbbcd40233e256.1716800023.git.michal.simek@amd.com
> 
> Rob:
>  This doesn't seem like an improvement. Is there another nvmem node at
>  this level? I would fix the binding instead if not.
> 
> Michal:
> That name came from discussion with Conor.

Did it? I don't recall that, only discussion about adding a "real"
example to the binding and noting a typo in the commit message.

> None suggested to fix dt-schema that's why soc-nvmem has been propagated to DT already and this patch is just fixing last occurrence.
> 
> commit d8764d347bd737efec00fae81133ffad0ae084bb (tag: zynqmp-dt-for-6.9)
> Author:     Michal Simek <michal.simek@amd.com>
> AuthorDate: Wed Jan 31 10:17:28 2024 +0100
> 
>     dt-bindings: firmware: xilinx: Describe soc-nvmem subnode
> 
>     Describe soc-nvmem subnode as the part of firmware node. The name can't be
>     pure nvmem because dt-schema already defines it as array property that's
>     why different name should be used.
> 
>     Acked-by: Conor Dooley <conor.dooley@microchip.com>
>     Link: https://lore.kernel.org/r/24fe6adbf2424360618e8f5ca541ebfd8bb0723e.1706692641.git.michal.simek@amd.com
>     Signed-off-by: Michal Simek <michal.simek@amd.com>
> 
> ---
>  Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml b/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
> index 917c40d5c382..1cbe44ab23b1 100644
> --- a/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
> +++ b/Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
> @@ -28,7 +28,7 @@ unevaluatedProperties: false
>  
>  examples:
>    - |
> -    nvmem {
> +    soc-nvmem {
>          compatible = "xlnx,zynqmp-nvmem-fw";
>          nvmem-layout {
>              compatible = "fixed-layout";
> -- 
> 2.43.0
> 

On 8/8/24 17:51, Conor Dooley wrote:
> On Thu, Aug 08, 2024 at 01:02:59PM +0200, Michal Simek wrote:
>> Based on commit d8764d347bd7 ("dt-bindings: firmware: xilinx: Describe
>> soc-nvmem subnode") soc-nvmem should be used instead of simple nvmem that's
>> why also update example to have it described correctly everywhere.
>>
>> Fixes: c7f99cd8fb6b ("dt-bindings: nvmem: Convert xlnx,zynqmp-nvmem.txt to yaml")
>> Signed-off-by: Michal Simek <michal.simek@amd.com>
>> Acked-by: Rob Herring (Arm) <robh@kernel.org>
>> ---
>>
>> Changes in v2:
>> - Fix sha1 in Fixes tag - reported by Stephen
>>
>> Adding comments from origin version
>> https://lore.kernel.org/r/42c21f3bcd75f821061d047730dbbcd40233e256.1716800023.git.michal.simek@amd.com
>>
>> Rob:
>>   This doesn't seem like an improvement. Is there another nvmem node at
>>   this level? I would fix the binding instead if not.
>>
>> Michal:
>> That name came from discussion with Conor.
> 
> Did it? I don't recall that, only discussion about adding a "real"
> example to the binding and noting a typo in the commit message.

Definitely you ack it and description was saying the reason for soc-nvmem name
https://lore.kernel.org/all/20240131-portal-glazing-16fa36efb3cb@spud/

And I found and sorry it wasn't you. It was Krzysztof over IRC who suggested it.
I can c&p paste our discussion if he agrees.

Thanks,
Michal

On Fri, Aug 09, 2024 at 08:38:46AM +0200, Michal Simek wrote:
> 
> 
> On 8/8/24 17:51, Conor Dooley wrote:
> > On Thu, Aug 08, 2024 at 01:02:59PM +0200, Michal Simek wrote:
> > > Based on commit d8764d347bd7 ("dt-bindings: firmware: xilinx: Describe
> > > soc-nvmem subnode") soc-nvmem should be used instead of simple nvmem that's
> > > why also update example to have it described correctly everywhere.
> > > 
> > > Fixes: c7f99cd8fb6b ("dt-bindings: nvmem: Convert xlnx,zynqmp-nvmem.txt to yaml")
> > > Signed-off-by: Michal Simek <michal.simek@amd.com>
> > > Acked-by: Rob Herring (Arm) <robh@kernel.org>
> > > ---
> > > 
> > > Changes in v2:
> > > - Fix sha1 in Fixes tag - reported by Stephen
> > > 
> > > Adding comments from origin version
> > > https://lore.kernel.org/r/42c21f3bcd75f821061d047730dbbcd40233e256.1716800023.git.michal.simek@amd.com
> > > 
> > > Rob:
> > >   This doesn't seem like an improvement. Is there another nvmem node at
> > >   this level? I would fix the binding instead if not.
> > > 
> > > Michal:
> > > That name came from discussion with Conor.
> > 
> > Did it? I don't recall that, only discussion about adding a "real"
> > example to the binding and noting a typo in the commit message.
> 
> Definitely you ack it and description was saying the reason for soc-nvmem name
> https://lore.kernel.org/all/20240131-portal-glazing-16fa36efb3cb@spud/

Yeah, to be clear I wasn't complaining about being name-dropped, just
was pointing out that it wasn't my idea, just something I didn't object
to :)

> 
> And I found and sorry it wasn't you. It was Krzysztof over IRC who suggested it.
> I can c&p paste our discussion if he agrees.
> 
> Thanks,
> Michal
> 
> 
> 

On 8/9/24 16:28, Conor Dooley wrote:
> On Fri, Aug 09, 2024 at 08:38:46AM +0200, Michal Simek wrote:
>>
>>
>> On 8/8/24 17:51, Conor Dooley wrote:
>>> On Thu, Aug 08, 2024 at 01:02:59PM +0200, Michal Simek wrote:
>>>> Based on commit d8764d347bd7 ("dt-bindings: firmware: xilinx: Describe
>>>> soc-nvmem subnode") soc-nvmem should be used instead of simple nvmem that's
>>>> why also update example to have it described correctly everywhere.
>>>>
>>>> Fixes: c7f99cd8fb6b ("dt-bindings: nvmem: Convert xlnx,zynqmp-nvmem.txt to yaml")
>>>> Signed-off-by: Michal Simek <michal.simek@amd.com>
>>>> Acked-by: Rob Herring (Arm) <robh@kernel.org>
>>>> ---
>>>>
>>>> Changes in v2:
>>>> - Fix sha1 in Fixes tag - reported by Stephen
>>>>
>>>> Adding comments from origin version
>>>> https://lore.kernel.org/r/42c21f3bcd75f821061d047730dbbcd40233e256.1716800023.git.michal.simek@amd.com
>>>>
>>>> Rob:
>>>>    This doesn't seem like an improvement. Is there another nvmem node at
>>>>    this level? I would fix the binding instead if not.
>>>>
>>>> Michal:
>>>> That name came from discussion with Conor.
>>>
>>> Did it? I don't recall that, only discussion about adding a "real"
>>> example to the binding and noting a typo in the commit message.
>>
>> Definitely you ack it and description was saying the reason for soc-nvmem name
>> https://lore.kernel.org/all/20240131-portal-glazing-16fa36efb3cb@spud/
> 
> Yeah, to be clear I wasn't complaining about being name-dropped, just
> was pointing out that it wasn't my idea, just something I didn't object
> to :)

Thanks and cheers,
Michal