Inter-revision diff: patch 6

Comparing v3 (message) to v2 (message)

--- v3
+++ v2
@@ -3,94 +3,96 @@
 
 Signed-off-by: Alexander Kurz <akurz@blala.de>
 ---
- .../devicetree/bindings/mfd/fsl,mc13xxx.yaml  | 70 +++++++++++++++++++
- 1 file changed, 70 insertions(+)
+ .../devicetree/bindings/mfd/fsl,mc13xxx.yaml  | 58 +++++++++++++++++++
+ 1 file changed, 58 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/mfd/fsl,mc13xxx.yaml b/Documentation/devicetree/bindings/mfd/fsl,mc13xxx.yaml
-index 007c2e3eee91..d2886f2686a8 100644
+index 94e2f6557376..761267b42c85 100644
 --- a/Documentation/devicetree/bindings/mfd/fsl,mc13xxx.yaml
 +++ b/Documentation/devicetree/bindings/mfd/fsl,mc13xxx.yaml
-@@ -39,6 +39,58 @@ properties:
+@@ -39,6 +39,41 @@ properties:
    interrupts:
      maxItems: 1
  
 +  buttons:
 +    type: object
++    $ref: /schemas/input/input.yaml#
++    description: Buttons
 +    properties:
-+      "#address-cells":
-+        const: 1
++      reg:
++        description: |
++          One of
++          MC13783 BUTTON IDs:
++            0: ONOFD1
++            1: ONOFD2
++            2: ONOFD3
++          MC13892 BUTTON IDs:
++            0: PWRON1
++            1: PWRON2
++            2: PWRON3
++          MC34708 BUTTON IDs:
++            0: PWRON1
++            1: PWRON2
 +
-+      "#size-cells":
-+        const: 0
++      debounce-delay-ms:
++        enum: [0, 30, 150, 750]
++        default: 30
++        description: |
++          Sets the debouncing delay in milliseconds.
++          Valid values: 0, 30, 150 and 750ms.
 +
-+    patternProperties:
-+      "^onkey@[0-2]$":
-+        $ref: /schemas/input/input.yaml#
-+        unevaluatedProperties: false
-+        type: object
++      active-low:
++        description: Set active when pin is pulled low.
 +
-+        properties:
-+          reg:
-+            description: |
-+              One of
-+              MC13783 BUTTON IDs:
-+                0: ONOFD1
-+                1: ONOFD2
-+                2: ONOFD3
-+
-+              MC13892 BUTTON IDs:
-+                0: PWRON1
-+                1: PWRON2
-+                2: PWRON3
-+
-+              MC34708 BUTTON IDs:
-+                0: PWRON1
-+                1: PWRON2
-+            maximum: 2
-+
-+          debounce-delay-ms:
-+            enum: [0, 30, 150, 750]
-+            default: 30
-+            description:
-+              Sets the debouncing delay in milliseconds.
-+
-+          active-low:
-+            description: Set active when pin is pulled low.
-+
-+          linux,code: true
-+
-+          fsl,enable-reset:
-+            description:
-+              Setting of the global reset option.
-+            type: boolean
-+
-+    unevaluatedProperties: false
++      fsl,enable-reset:
++        description: |
++          Setting of the global reset option.
++        type: boolean
 +
    leds:
      type: object
      $ref: /schemas/leds/common.yaml#
-@@ -159,6 +211,12 @@ allOf:
+@@ -119,6 +154,10 @@ allOf:
+             const: fsl,mc13783
+     then:
+       properties:
++        buttons:
++          properties:
++            reg:
++              enum: [0, 1, 2]
+         leds:
+           properties:
+             fsl,led-control:
+@@ -137,6 +176,10 @@ allOf:
+             const: fsl,mc13892
+     then:
+       properties:
++        buttons:
++          properties:
++            reg:
++              enum: [0, 1, 2]
+         leds:
+           properties:
+             fsl,led-control:
+@@ -155,6 +198,10 @@ allOf:
              const: fsl,mc34708
      then:
        properties:
 +        buttons:
-+          patternProperties:
-+            "^onkey@[0-2]$":
-+              properties:
-+                reg:
-+                  maximum: 1
++          properties:
++            reg:
++              enum: [0, 1]
          leds:
            properties:
-             led-control:
-@@ -187,6 +245,18 @@ examples:
+             fsl,led-control:
+@@ -183,6 +230,17 @@ examples:
              fsl,mc13xxx-uses-rtc;
              fsl,mc13xxx-uses-adc;
  
 +            buttons {
 +                #address-cells = <1>;
 +                #size-cells = <0>;
-+
-+                onkey@0 {
++                onkey1@0 {
 +                    reg = <0>;
 +                    debounce-delay-ms = <30>;
 +                    active-low;
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help