Skip to contentSkip to conversation

dt-bindings: serial: 8250: move a constraint

PATCH In review Alex Elder 2 participants 2 messages Aug 13, 2025

Subsystems (4)
Device tree bindings RISC-V TTY layer and serial drivers RISC-V SpacemiT SoC Support
lore
Share & tools
lore

Alex Elder

author
#0 lore raw

PATCH 1/1 dt-bindings: serial: 8250: move a constraint

A block that required a "spacemit,k1-uart" compatible node to specify two clocks was placed in the wrong spot in the binding. Conor Dooley pointed out it belongs earlier in the file, as part of the initial "allOf".

Fixes 2c0594f9f0629 ("dt-bindings: serial: 8250: support an optional second clock")
Reported-by Conor Dooley <[email protected]>
Closes https://lore.kernel.org/lkml/20250729-reshuffle-contented-e6def76b540b@spud/ open here
Signed-off-by Alex Elder <[email protected]>
---
 .../devicetree/bindings/serial/8250.yaml      | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)
Documentation/devicetree/bindings/serial/8250.yaml +22 -24
index e46bee8d25bf0..f59c0b37e8ebb 100644
@@ -48,7 +48,6 @@ allOf:
       oneOf:
         - required: [ clock-frequency ]
         - required: [ clocks ]
-
   - if:
       properties:
         compatible:

@@ -66,6 +65,28 @@ allOf:
           items:
             - const: core
             - const: bus
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - spacemit,k1-uart
+              - nxp,lpc1850-uart
+    then:
+      required:
+        - clocks
+        - clock-names
+      properties:
+        clocks:
+          minItems: 2
+        clock-names:
+          minItems: 2
+    else:
+      properties:
+        clocks:
+          maxItems: 1
+        clock-names:
+          maxItems: 1
 
 properties:
   compatible:

@@ -264,29 +285,6 @@ required:
   - reg
   - interrupts
 
-if:
-  properties:
-    compatible:
-      contains:
-        enum:
-          - spacemit,k1-uart
-          - nxp,lpc1850-uart
-then:
-  required:
-    - clocks
-    - clock-names
-  properties:
-    clocks:
-      minItems: 2
-    clock-names:
-      minItems: 2
-else:
-  properties:
-    clocks:
-      maxItems: 1
-    clock-names:
-      maxItems: 1
-
 unevaluatedProperties: false
 
 examples:

base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585

Signature · 1 line
2.48.1
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Alex Elder

A block that required a "spacemit,k1-uart" compatible node to specify two clocks was placed in the wrong spot in the binding. Conor Dooley pointed out it belongs earlier in the file, as part of the initial "allOf".

Fixes 2c0594f9f0629 ("dt-bindings: serial: 8250: support an optional second clock")
Reported-by Conor Dooley <[email protected]>
Closes https://lore.kernel.org/lkml/20250729-reshuffle-contented-e6def76b540b@spud/ open here
Signed-off-by Alex Elder <[email protected]>
Acked-by Conor Dooley <[email protected]>