The general trend is to have devicetree bindings in YAML format, to
allow automatic validation of bindings and devicetrees.
Convert the NPCM SoC family's binding to YAML before it accumulates more
entries.
The nuvoton,npcm750-evb compatible string is introduced to keep the
structure of the binding a little simpler.
Signed-off-by: Jonathan Neuschäfer <[email protected]>
---
If someone else wants to be listed as the maintainer, please let me
know.
---
.../devicetree/bindings/arm/npcm/npcm.txt | 6 -----
.../devicetree/bindings/arm/npcm/npcm.yaml | 23 +++++++++++++++++++
2 files changed, 23 insertions(+), 6 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/npcm/npcm.txt
create mode 100644 Documentation/devicetree/bindings/arm/npcm/npcm.yaml
diff --git a/Documentation/devicetree/bindings/arm/npcm/npcm.txt b/Documentation/devicetree/bindings/arm/npcm/npcm.txt
deleted file mode 100644
index 2d87d9ecea85b..0000000000000
--- a/Documentation/devicetree/bindings/arm/npcm/npcm.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-NPCM Platforms Device Tree Bindings
------------------------------------
-NPCM750 SoC
-Required root node properties:
- - compatible = "nuvoton,npcm750";
-
diff --git a/Documentation/devicetree/bindings/arm/npcm/npcm.yaml b/Documentation/devicetree/bindings/arm/npcm/npcm.yaml
new file mode 100644
index 0000000000000..e2cf790a2c63e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/npcm/npcm.yaml
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/npcm.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NPCM Platforms Device Tree Bindings
+
+maintainers:
+ - Jonathan Neuschäfer <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ oneOf:
+ - description: NPCM750 based boards
+ items:
+ - enum:
+ - nuvoton,npcm750-evb # NPCM750 evaluation board
+ - const: nuvoton,npcm750
+
+additionalProperties: true
--
2.29.2
According to the revised binding, the devicetree needs a board-specific
compatible string.
Signed-off-by: Jonathan Neuschäfer <[email protected]>
---
arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
index 9f13d08f5804e..dea3dbc4a6a52 100644
--- a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
+++ b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
@@ -9,7 +9,7 @@
/ {
model = "Nuvoton npcm750 Development Board (Device Tree)";
- compatible = "nuvoton,npcm750";
+ compatible = "nuvoton,npcm750-evb", "nuvoton,npcm750";
aliases {
ethernet2 = &gmac0;
--
2.29.2
On Fri, 08 Jan 2021 23:40:06 +0100, Jonathan Neuschäfer wrote:
> The general trend is to have devicetree bindings in YAML format, to
> allow automatic validation of bindings and devicetrees.
>
> Convert the NPCM SoC family's binding to YAML before it accumulates more
> entries.
>
> The nuvoton,npcm750-evb compatible string is introduced to keep the
> structure of the binding a little simpler.
>
> Signed-off-by: Jonathan Neuschäfer <[email protected]>
> ---
>
> If someone else wants to be listed as the maintainer, please let me
> know.
> ---
> .../devicetree/bindings/arm/npcm/npcm.txt | 6 -----
> .../devicetree/bindings/arm/npcm/npcm.yaml | 23 +++++++++++++++++++
> 2 files changed, 23 insertions(+), 6 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/npcm/npcm.txt
> create mode 100644 Documentation/devicetree/bindings/arm/npcm/npcm.yaml
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
./Documentation/devicetree/bindings/arm/npcm/npcm.yaml:20:13: [warning] wrong indentation: expected 14 but found 12 (indentation)
dtschema/dtc warnings/errors:
./Documentation/devicetree/bindings/arm/npcm/npcm.yaml: $id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/arm/npcm/npcm.yaml#
See https://patchwork.ozlabs.org/patch/1423975
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
On Sun, Jan 10, 2021 at 11:18:46AM -0600, Rob Herring wrote:
[...]
> My bot found errors running 'make dt_binding_check' on your patch:
>
> yamllint warnings/errors:
> ./Documentation/devicetree/bindings/arm/npcm/npcm.yaml:20:13: [warning] wrong indentation: expected 14 but found 12 (indentation)
>
> dtschema/dtc warnings/errors:
> ./Documentation/devicetree/bindings/arm/npcm/npcm.yaml: $id: relative path/filename doesn't match actual path or filename
> expected: http://devicetree.org/schemas/arm/npcm/npcm.yaml#
Sorry for missing those. I'll fix them in version 2.
Best regards,
Jonathan Neuschäfer