| Message ID | 20190907092007.9946-8-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v2,01/11] dt-bindings: power: syscon-reboot: Convert bindings to json-schema | expand |
On Sat, Sep 07, 2019 at 11:20:04AM +0200, Krzysztof Kozlowski wrote: > Convert Samsung Exynos System Registers (SYSREG) bindings to DT schema > format using json-schema. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > Example somehow fails: > Documentation/devicetree/bindings/arm/samsung/pmu.example.dt.yaml: > system-controller@10040000: compatible:0: 'samsung,exynos5250-pmu' is > not one of ['samsung,exynos4-sysreg', 'samsung,exynos5-sysreg'] > > It seems that PMU schema is applied to sysreq nodes (and vice-versa). > --- > .../bindings/arm/samsung/sysreg.txt | 19 ----------- > .../bindings/arm/samsung/sysreg.yaml | 33 +++++++++++++++++++ > 2 files changed, 33 insertions(+), 19 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt > create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.yaml > > diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt b/Documentation/devicetree/bindings/arm/samsung/sysreg.txt > deleted file mode 100644 > index 4fced6e9d5e4..000000000000 > --- a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt > +++ /dev/null > @@ -1,19 +0,0 @@ > -SAMSUNG S5P/Exynos SoC series System Registers (SYSREG) > - > -Properties: > - - compatible : should contain two values. First value must be one from following list: > - - "samsung,exynos4-sysreg" - for Exynos4 based SoCs, > - - "samsung,exynos5-sysreg" - for Exynos5 based SoCs. > - second value must be always "syscon". > - - reg : offset and length of the register set. > - > -Example: > - syscon@10010000 { > - compatible = "samsung,exynos4-sysreg", "syscon"; > - reg = <0x10010000 0x400>; > - }; > - > - syscon@10050000 { > - compatible = "samsung,exynos5-sysreg", "syscon"; > - reg = <0x10050000 0x5000>; > - }; > diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml b/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml > new file mode 100644 > index 000000000000..a3d44646e441 > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml > @@ -0,0 +1,33 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/arm/samsung/sysreg.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Samsung S5P/Exynos SoC series System Registers (SYSREG) > + > +maintainers: > + - Krzysztof Kozlowski <krzk@kernel.org> > + > +properties: > + compatible: > + items: > + - enum: > + - samsung,exynos4-sysreg > + - samsung,exynos5-sysreg > + - const: syscon The problem is this will by default match any node with 'syscon'. You have to add a custom 'select' entry. See the LVDS panel bindings for an example. I'd like to kill off 'syscon'... > + > + reg: > + maxItems: 1 > + > +examples: > + - | > + syscon@10010000 { > + compatible = "samsung,exynos4-sysreg", "syscon"; > + reg = <0x10010000 0x400>; > + }; > + > + syscon@10050000 { > + compatible = "samsung,exynos5-sysreg", "syscon"; > + reg = <0x10050000 0x5000>; > + }; > -- > 2.17.1 >
On Wed, 18 Sep 2019 at 14:36, Rob Herring <robh@kernel.org> wrote: > > On Sat, Sep 07, 2019 at 11:20:04AM +0200, Krzysztof Kozlowski wrote: > > Convert Samsung Exynos System Registers (SYSREG) bindings to DT schema > > format using json-schema. > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > --- > > > > Example somehow fails: > > Documentation/devicetree/bindings/arm/samsung/pmu.example.dt.yaml: > > system-controller@10040000: compatible:0: 'samsung,exynos5250-pmu' is > > not one of ['samsung,exynos4-sysreg', 'samsung,exynos5-sysreg'] > > > > It seems that PMU schema is applied to sysreq nodes (and vice-versa). > > --- > > .../bindings/arm/samsung/sysreg.txt | 19 ----------- > > .../bindings/arm/samsung/sysreg.yaml | 33 +++++++++++++++++++ > > 2 files changed, 33 insertions(+), 19 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt > > create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.yaml > > > > diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt b/Documentation/devicetree/bindings/arm/samsung/sysreg.txt > > deleted file mode 100644 > > index 4fced6e9d5e4..000000000000 > > --- a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt > > +++ /dev/null > > @@ -1,19 +0,0 @@ > > -SAMSUNG S5P/Exynos SoC series System Registers (SYSREG) > > - > > -Properties: > > - - compatible : should contain two values. First value must be one from following list: > > - - "samsung,exynos4-sysreg" - for Exynos4 based SoCs, > > - - "samsung,exynos5-sysreg" - for Exynos5 based SoCs. > > - second value must be always "syscon". > > - - reg : offset and length of the register set. > > - > > -Example: > > - syscon@10010000 { > > - compatible = "samsung,exynos4-sysreg", "syscon"; > > - reg = <0x10010000 0x400>; > > - }; > > - > > - syscon@10050000 { > > - compatible = "samsung,exynos5-sysreg", "syscon"; > > - reg = <0x10050000 0x5000>; > > - }; > > diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml b/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml > > new file mode 100644 > > index 000000000000..a3d44646e441 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml > > @@ -0,0 +1,33 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/arm/samsung/sysreg.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Samsung S5P/Exynos SoC series System Registers (SYSREG) > > + > > +maintainers: > > + - Krzysztof Kozlowski <krzk@kernel.org> > > + > > +properties: > > + compatible: > > + items: > > + - enum: > > + - samsung,exynos4-sysreg > > + - samsung,exynos5-sysreg > > + - const: syscon > > The problem is this will by default match any node with 'syscon'. You > have to add a custom 'select' entry. See the LVDS panel bindings for an > example. > > I'd like to kill off 'syscon'... I see that panels use empty {} match but some other examples use custom select. The panel approach in my case does not actually check whether last compatible is syscon. I'll go then with a separate select approach. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt b/Documentation/devicetree/bindings/arm/samsung/sysreg.txt deleted file mode 100644 index 4fced6e9d5e4..000000000000 --- a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt +++ /dev/null @@ -1,19 +0,0 @@ -SAMSUNG S5P/Exynos SoC series System Registers (SYSREG) - -Properties: - - compatible : should contain two values. First value must be one from following list: - - "samsung,exynos4-sysreg" - for Exynos4 based SoCs, - - "samsung,exynos5-sysreg" - for Exynos5 based SoCs. - second value must be always "syscon". - - reg : offset and length of the register set. - -Example: - syscon@10010000 { - compatible = "samsung,exynos4-sysreg", "syscon"; - reg = <0x10010000 0x400>; - }; - - syscon@10050000 { - compatible = "samsung,exynos5-sysreg", "syscon"; - reg = <0x10050000 0x5000>; - }; diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml b/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml new file mode 100644 index 000000000000..a3d44646e441 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/samsung/sysreg.yaml @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/samsung/sysreg.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung S5P/Exynos SoC series System Registers (SYSREG) + +maintainers: + - Krzysztof Kozlowski <krzk@kernel.org> + +properties: + compatible: + items: + - enum: + - samsung,exynos4-sysreg + - samsung,exynos5-sysreg + - const: syscon + + reg: + maxItems: 1 + +examples: + - | + syscon@10010000 { + compatible = "samsung,exynos4-sysreg", "syscon"; + reg = <0x10010000 0x400>; + }; + + syscon@10050000 { + compatible = "samsung,exynos5-sysreg", "syscon"; + reg = <0x10050000 0x5000>; + };
Convert Samsung Exynos System Registers (SYSREG) bindings to DT schema format using json-schema. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- Example somehow fails: Documentation/devicetree/bindings/arm/samsung/pmu.example.dt.yaml: system-controller@10040000: compatible:0: 'samsung,exynos5250-pmu' is not one of ['samsung,exynos4-sysreg', 'samsung,exynos5-sysreg'] It seems that PMU schema is applied to sysreq nodes (and vice-versa). --- .../bindings/arm/samsung/sysreg.txt | 19 ----------- .../bindings/arm/samsung/sysreg.yaml | 33 +++++++++++++++++++ 2 files changed, 33 insertions(+), 19 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.yaml