| Message ID | 20210906120404.10005-1-jbx6244@gmail.com |
|---|---|
| State | Accepted |
| Commit | 07c54d9a409f1fd54df328ec742f156547594347 |
| Headers | show |
| Series | [RFC,1/4] dt-bindings: thermal: allow more resets for tsadc node in rockchip-thermal.yaml | expand |
On Mon, Sep 06, 2021 at 02:04:01PM +0200, Johan Jonker wrote: > 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. I don't think I'd deprecate it for that reason. And removing it would break any kernel before the devm_reset_control_array_get change. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > --- > .../devicetree/bindings/thermal/rockchip-thermal.yaml | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml > index b96ea277b..ee104e451 100644 > --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml > +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml > @@ -37,11 +37,16 @@ properties: > - const: apb_pclk > > resets: > - maxItems: 1 > + minItems: 1 > + maxItems: 3 > > reset-names: > + deprecated: true > + minItems: 1 > items: > - const: tsadc-apb > + - const: tsadc > + - const: tsadc-phy > > "#thermal-sensor-cells": > const: 1 > @@ -71,7 +76,6 @@ required: > - clocks > - clock-names > - resets > - - reset-names > - "#thermal-sensor-cells" > > additionalProperties: false > -- > 2.20.1 > >
diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml index b96ea277b..ee104e451 100644 --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml @@ -37,11 +37,16 @@ properties: - const: apb_pclk resets: - maxItems: 1 + minItems: 1 + maxItems: 3 reset-names: + deprecated: true + minItems: 1 items: - const: tsadc-apb + - const: tsadc + - const: tsadc-phy "#thermal-sensor-cells": const: 1 @@ -71,7 +76,6 @@ required: - clocks - clock-names - resets - - reset-names - "#thermal-sensor-cells" additionalProperties: false
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 <jbx6244@gmail.com> --- .../devicetree/bindings/thermal/rockchip-thermal.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)