The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     07c54d9a409f1fd54df328ec742f156547594347
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//07c54d9a409f1fd54df328ec742f156547594347
Author:        Johan Jonker [off-list ref]
AuthorDate:    Thu, 30 Sep 2021 13:05:14 +02:00
Committer:     Daniel Lezcano [off-list ref]
CommitterDate: Sun, 17 Oct 2021 00:14:55 +02:00

dt-bindings: thermal: allow more resets for tsadc node in rockchip-thermal.yaml

The tsadc node in rk356x.dtsi has more resets defined then currently
allowed by rockchip-thermal.yaml, so fix that in the documentation.
The driver now uses the devm_reset_control_array_get() function,
so reset-names is no longer required, but keep it for legacy reasons.

Signed-off-by: Johan Jonker <redacted>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210930110517.14323-1-jbx6244@gmail.com (local)
Signed-off-by: Daniel Lezcano <redacted>
---
 Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
index b96ea27..3c07470 100644
--- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
+++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml

@@ -37,11 +37,15 @@ properties:
       - const: apb_pclk
 
   resets:
-    maxItems: 1
+    minItems: 1
+    maxItems: 3
 
   reset-names:
+    minItems: 1
     items:
       - const: tsadc-apb
+      - const: tsadc
+      - const: tsadc-phy
 
   "#thermal-sensor-cells":
     const: 1

@@ -71,7 +75,6 @@ required:
   - clocks
   - clock-names
   - resets
-  - reset-names
   - "#thermal-sensor-cells"
 
 additionalProperties: false