Skip to contentSkip to conversation

dt-bindings: Remove FIXME in yaml bindings

PATCH Applied Maxime Ripard 2 participants 2 messages Nov 1, 2019 – Nov 6, 2019

Subsystems (10)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dt-bindings: Remove FIXME in yaml bindings

Some binding that were introduced early on got a comment to enable additionalProperties, but we couldn't due to the generic properties being reported as errors.

The way we're dealing with this now is to use the draft-08's unevaluatedProperties (even though the tools doesn't do anything with it yet).

Let's convert those old bindings to it.

---
 .../devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml   | 4 +---
 .../devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml   | 4 +---
 .../devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml        | 4 +---
 .../interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml    | 4 +---
 .../devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml   | 4 +---
 .../devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml    | 6 ++----
 .../devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml   | 6 ++----
 .../devicetree/bindings/net/allwinner,sun4i-a10-mdio.yaml   | 6 ++----
 .../devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml   | 6 ++----
 .../devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml  | 6 ++----
 .../devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml  | 4 +---
 11 files changed, 16 insertions(+), 38 deletions(-)
Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml +1 -3
index 4cb9d6b93138..387d599522c7 100644
@@ -68,9 +68,7 @@ else:
     clocks:
       maxItems: 1
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml +1 -3
index f9d526b7da01..9346ef6ba61b 100644
@@ -40,9 +40,7 @@ required:
   - clocks
   - resets
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml +1 -3
index c779000515d6..2ceb05ba2df5 100644
@@ -93,9 +93,7 @@ allOf:
       required:
         - resets
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml +1 -3
index 0eccf5551786..8cd08cfb25be 100644
@@ -52,9 +52,7 @@ required:
   - interrupts
   - interrupt-controller
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml +1 -3
index 98c1bdde9a86..dea36d68cdbe 100644
@@ -60,9 +60,7 @@ required:
   - clocks
   - clock-names
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml +2 -4
index d2d4308596b8..64bca41031d5 100644
@@ -85,6 +85,8 @@ required:
   - clocks
   - clock-names
 
+unevaluatedProperties: false
+
 examples:
   - |
     mmc0: mmc@1c0f000 {
@@ -97,8 +99,4 @@ examples:
         cd-gpios = <&pio 7 1 0>;
     };
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
-
 ...
Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +2 -4
index 792196bf4abd..ae4796ec50a0 100644
@@ -38,6 +38,8 @@ required:
   - phy-handle
   - allwinner,sram
 
+unevaluatedProperties: false
+
 examples:
   - |
     emac: ethernet@1c0b000 {
@@ -49,8 +51,4 @@ examples:
         allwinner,sram = <&emac_sram 1>;
     };
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
-
 ...
Documentation/devicetree/bindings/net/allwinner,sun4i-a10-mdio.yaml +2 -4
index df24d9d969f7..e5562c525ed9 100644
@@ -49,6 +49,8 @@ required:
   - compatible
   - reg
 
+unevaluatedProperties: false
+
 examples:
   - |
     mdio@1c0b080 {
@@ -63,8 +65,4 @@ examples:
         };
     };
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
-
 ...
Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml +2 -4
index ef446ae166f3..f683b7104e3e 100644
@@ -49,6 +49,8 @@ required:
   - clock-names
   - phy-mode
 
+unevaluatedProperties: false
+
 examples:
   - |
     gmac: ethernet@1c50000 {
@@ -61,8 +63,4 @@ examples:
         phy-mode = "mii";
     };
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
-
 ...
Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml +2 -4
index 3fb0714e761e..11654d4b80fb 100644
@@ -184,6 +184,8 @@ allOf:
             - mdio-parent-bus
             - mdio@1
 
+unevaluatedProperties: false
+
 examples:
   - |
     ethernet@1c0b000 {
@@ -314,8 +316,4 @@ examples:
         };
     };
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
-
 ...
Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml +1 -3
index 1084e9d2917d..659b02002a35 100644
@@ -31,9 +31,7 @@ required:
   - compatible
   - reg
 
-# FIXME: We should set it, but it would report all the generic
-# properties as additional properties.
-# additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
Signature · 1 line
2.23.0
maintainer Applied
#1 lore raw
Quoted 11 lines · Maxime Ripard

Some binding that were introduced early on got a comment to enable additionalProperties, but we couldn't due to the generic properties being reported as errors.

The way we're dealing with this now is to use the draft-08's unevaluatedProperties (even though the tools doesn't do anything with it yet).

Let's convert those old bindings to it.

Quoted 14 lines
---
 .../devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml   | 4 +---
 .../devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml   | 4 +---
 .../devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml        | 4 +---
 .../interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml    | 4 +---
 .../devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml   | 4 +---
 .../devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml    | 6 ++----
 .../devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml   | 6 ++----
 .../devicetree/bindings/net/allwinner,sun4i-a10-mdio.yaml   | 6 ++----
 .../devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml   | 6 ++----
 .../devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml  | 6 ++----
 .../devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml  | 4 +---
 11 files changed, 16 insertions(+), 38 deletions(-)

Applied, thanks.

Rob