From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Date: Fri, 21 Jun 2024 21:57:18 +0000 (+0300)
Subject: dt-bindings: mfd: rk817: Fixup clocks and reference dai-common
X-Git-Tag: v6.11-rc1~147^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7865de24e8d83b4f12bbca8be2f9d5de464b5fa;p=thirdparty%2Fkernel%2Flinux.git

dt-bindings: mfd: rk817: Fixup clocks and reference dai-common

Ensure 'clocks' property does not allow more than one item and add the
missing reference to dai-common schema.

While at it, move 'clocks*' and '#sound-dai-cells' properties to keep
the list ordered alphabetically.

Additionally, drop all useless/redundant descriptions.

Fixes: 6c38ca03406e ("dt-bindings: mfd: rk808: Convert bindings to yaml")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20240622-rk809-fixes-v2-1-c0db420d3639@collabora.com
Signed-off-by: Lee Jones <lee@kernel.org>
---

diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
index 8c2fd0fabb927..d70b4307ac77e 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
@@ -32,6 +32,13 @@ properties:
     minimum: 0
     maximum: 1
 
+  clocks:
+    maxItems: 1
+
+  clock-names:
+    items:
+      - const: mclk
+
   clock-output-names:
     description:
       From common clock binding to override the default output clock name.
@@ -42,6 +49,9 @@ properties:
     description:
       Telling whether or not this PMIC is controlling the system power.
 
+  '#sound-dai-cells':
+    const: 0
+
   system-power-controller: true
 
   wakeup-source:
@@ -94,26 +104,7 @@ properties:
         $ref: /schemas/regulator/regulator.yaml#
     unevaluatedProperties: false
 
-  clocks:
-    description:
-      The input clock for the audio codec.
-
-  clock-names:
-    description:
-      The clock name for the codec clock.
-    items:
-      - const: mclk
-
-  '#sound-dai-cells':
-    description:
-      Needed for the interpretation of sound dais.
-    const: 0
-
   codec:
-    description: |
-      The child node for the codec to hold additional properties. If no
-      additional properties are required for the codec, this node can be
-      omitted.
     type: object
     additionalProperties: false
     properties:
@@ -123,9 +114,6 @@ properties:
           Describes if the microphone uses differential mode.
 
   charger:
-    description: |
-      The child node for the charger to hold additional properties. If a
-      battery is not in use, this node can be omitted.
     type: object
     $ref: /schemas/power/supply/power-supply.yaml
 
@@ -168,6 +156,7 @@ properties:
     additionalProperties: false
 
 allOf:
+  - $ref: /schemas/sound/dai-common.yaml#
   - if:
       properties:
         '#clock-cells':