2020-04-11 12:26:52

by Johan Jonker

Subject: [PATCH v4] dt-bindings: sram: convert rockchip-pmu-sram bindings to yaml

Current dts files with 'rockchip-pmu-sram' compatible nodes
are now verified with sram.yaml, although the original
text document still exists. Merge rockchip-pmu-sram.txt
with sram.yaml by adding it as description with an example.
Make #address-cells, #size-cells and ranges optional
if there are no child nodes to prevent yaml warnings.

Signed-off-by: Johan Jonker <[email protected]>
---
Changes v4:
Make some properties optional

Changes v3:
Document the compatible

Changed v2:
Merge with sram.yaml
---
.../devicetree/bindings/sram/rockchip-pmu-sram.txt | 16 -------------
Documentation/devicetree/bindings/sram/sram.yaml | 26 +++++++++++++++++++---
2 files changed, 23 insertions(+), 19 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt

diff --git a/Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt b/Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt
deleted file mode 100644
index 6b42fda30..000000000
--- a/Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Rockchip SRAM for pmu:
-------------------------------
-
-The sram of pmu is used to store the function of resume from maskrom(the 1st
-level loader). This is a common use of the "pmu-sram" because it keeps power
-even in low power states in the system.
-
-Required node properties:
-- compatible : should be "rockchip,rk3288-pmu-sram"
-- reg : physical base address and the size of the registers window
-
-Example:
- sram@ff720000 {
- compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
- reg = <0xff720000 0x1000>;
- };
diff --git a/Documentation/devicetree/bindings/sram/sram.yaml b/Documentation/devicetree/bindings/sram/sram.yaml
index 7b83cc6c9..f474fee47 100644
--- a/Documentation/devicetree/bindings/sram/sram.yaml
+++ b/Documentation/devicetree/bindings/sram/sram.yaml
@@ -29,6 +29,7 @@ properties:
enum:
- mmio-sram
- atmel,sama5d2-securam
+ - rockchip,rk3288-pmu-sram

reg:
maxItems: 1
@@ -118,9 +119,18 @@ patternProperties:
required:
- compatible
- reg
- - "#address-cells"
- - "#size-cells"
- - ranges
+
+if:
+ properties:
+ compatible:
+ contains:
+ const: rockchip,rk3288-pmu-sram
+
+else:
+ required:
+ - "#address-cells"
+ - "#size-cells"
+ - ranges

additionalProperties: false

@@ -224,6 +234,16 @@ examples:
};

- |
+ // Rockchip's rk3288 SoC uses the sram of pmu to store the function of
+ // resume from maskrom(the 1st level loader). This is a common use of
+ // the "pmu-sram" because it keeps power even in low power states
+ // in the system.
+ sram@ff720000 {
+ compatible = "rockchip,rk3288-pmu-sram", "mmio-sram";
+ reg = <0xff720000 0x1000>;
+ };
+
+ - |
// Allwinner's A80 SoC uses part of the secure sram for hotplugging of the
// primary core (cpu0). Once the core gets powered up it checks if a magic
// value is set at a specific location. If it is then the BROM will jump
--
2.11.0

2020-04-20 19:16:15

by Rob Herring (Arm)

Subject: Re: [PATCH v4] dt-bindings: sram: convert rockchip-pmu-sram bindings to yaml

On Sat, 11 Apr 2020 14:25:07 +0200, Johan Jonker wrote:
> Current dts files with 'rockchip-pmu-sram' compatible nodes
> are now verified with sram.yaml, although the original
> text document still exists. Merge rockchip-pmu-sram.txt
> with sram.yaml by adding it as description with an example.
> Make #address-cells, #size-cells and ranges optional
> if there are no child nodes to prevent yaml warnings.
>
> Signed-off-by: Johan Jonker <[email protected]>
> ---
> Changes v4:
> Make some properties optional
>
> Changes v3:
> Document the compatible
>
> Changed v2:
> Merge with sram.yaml
> ---
> .../devicetree/bindings/sram/rockchip-pmu-sram.txt | 16 -------------
> Documentation/devicetree/bindings/sram/sram.yaml | 26 +++++++++++++++++++---
> 2 files changed, 23 insertions(+), 19 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/sram/rockchip-pmu-sram.txt
>

Applied, thanks.

Rob