| Message ID | 20231209171653.85468-1-david@ixit.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/3] dt-bindings: arm: hwmon: gpio-fan: Convert txt bindings to yaml | expand |
On Sat, Dec 09, 2023 at 06:15:39PM +0100, David Heidelberg wrote: > Convert fan devices connected to GPIOs to the YAML syntax. > > Signed-off-by: David Heidelberg <david@ixit.cz> I keep wondering: What does this have to do with arm (in the subject) ? Guenter
Nothing, as I was working on others ARM-related bindings, it just sneaked in. Good catch. Should I resend with adjusted name or can this by done by quick adjust before the merge? David On 11/12/2023 15:34, Guenter Roeck wrote: > On Sat, Dec 09, 2023 at 06:15:39PM +0100, David Heidelberg wrote: >> Convert fan devices connected to GPIOs to the YAML syntax. >> >> Signed-off-by: David Heidelberg <david@ixit.cz> > I keep wondering: What does this have to do with arm (in the subject) ? > > Guenter
On 12/11/23 11:28, David Heidelberg wrote: > Nothing, as I was working on others ARM-related bindings, it just sneaked in. Good catch. > > Should I resend with adjusted name or can this by done by quick adjust before the merge? > No need to resend. I'll fix that up, assuming you get a Reviewed-by: tag from a dt maintainer. Guenter > David > > On 11/12/2023 15:34, Guenter Roeck wrote: >> On Sat, Dec 09, 2023 at 06:15:39PM +0100, David Heidelberg wrote: >>> Convert fan devices connected to GPIOs to the YAML syntax. >>> >>> Signed-off-by: David Heidelberg <david@ixit.cz> >> I keep wondering: What does this have to do with arm (in the subject) ? >> >> Guenter >
On Mon, Dec 11, 2023 at 11:42:09AM -0800, Guenter Roeck wrote: > On 12/11/23 11:28, David Heidelberg wrote: > > Nothing, as I was working on others ARM-related bindings, it just sneaked in. Good catch. > > > > Should I resend with adjusted name or can this by done by quick adjust before the merge? > > > > No need to resend. I'll fix that up, assuming you get a Reviewed-by: tag from a dt > maintainer. I think it is okay. Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Cheers, Conor.
On Sat, 9 Dec 2023 18:15:39 +0100, David Heidelberg wrote: > Convert fan devices connected to GPIOs to the YAML syntax. > > Applied, thanks! [2/3] arm64: dts: rockchip: make dts use gpio-fan matrix instead of array commit: 75e8d5bad12282a35ad87db4409490b1fcd2518f Best regards,
On Sat, Dec 09, 2023 at 06:15:39PM +0100, David Heidelberg wrote: > Convert fan devices connected to GPIOs to the YAML syntax. > > Signed-off-by: David Heidelberg <david@ixit.cz> > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Applied. Thanks, Guenter > --- > v4: > - dropped the 1st example > - dropped unused label in 2nd example (now 1st example) > > .../devicetree/bindings/hwmon/gpio-fan.txt | 41 ------------- > .../devicetree/bindings/hwmon/gpio-fan.yaml | 60 +++++++++++++++++++ > 2 files changed, 60 insertions(+), 41 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/hwmon/gpio-fan.txt > create mode 100644 Documentation/devicetree/bindings/hwmon/gpio-fan.yaml > > diff --git a/Documentation/devicetree/bindings/hwmon/gpio-fan.txt b/Documentation/devicetree/bindings/hwmon/gpio-fan.txt > deleted file mode 100644 > index f4cfa350f6a1..000000000000 > --- a/Documentation/devicetree/bindings/hwmon/gpio-fan.txt > +++ /dev/null > @@ -1,41 +0,0 @@ > -Bindings for fan connected to GPIO lines > - > -Required properties: > -- compatible : "gpio-fan" > - > -Optional properties: > -- gpios: Specifies the pins that map to bits in the control value, > - ordered MSB-->LSB. > -- gpio-fan,speed-map: A mapping of possible fan RPM speeds and the > - control value that should be set to achieve them. This array > - must have the RPM values in ascending order. > -- alarm-gpios: This pin going active indicates something is wrong with > - the fan, and a udev event will be fired. > -- #cooling-cells: If used as a cooling device, must be <2> > - Also see: > - Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml > - min and max states are derived from the speed-map of the fan. > - > -Note: At least one the "gpios" or "alarm-gpios" properties must be set. > - > -Examples: > - > - gpio_fan { > - compatible = "gpio-fan"; > - gpios = <&gpio1 14 1 > - &gpio1 13 1>; > - gpio-fan,speed-map = <0 0 > - 3000 1 > - 6000 2>; > - alarm-gpios = <&gpio1 15 1>; > - }; > - gpio_fan_cool: gpio_fan { > - compatible = "gpio-fan"; > - gpios = <&gpio2 14 1 > - &gpio2 13 1>; > - gpio-fan,speed-map = <0 0>, > - <3000 1>, > - <6000 2>; > - alarm-gpios = <&gpio2 15 1>; > - #cooling-cells = <2>; /* min followed by max */ > - }; > diff --git a/Documentation/devicetree/bindings/hwmon/gpio-fan.yaml b/Documentation/devicetree/bindings/hwmon/gpio-fan.yaml > new file mode 100644 > index 000000000000..7f30cfc87350 > --- /dev/null > +++ b/Documentation/devicetree/bindings/hwmon/gpio-fan.yaml > @@ -0,0 +1,60 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/hwmon/gpio-fan.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Fan connected to GPIO lines > + > +maintainers: > + - Rob Herring <robh@kernel.org> > + > +properties: > + compatible: > + const: gpio-fan > + > + gpios: > + description: | > + Specifies the pins that map to bits in the control value, > + ordered MSB-->LSB. > + minItems: 1 > + maxItems: 7 > + > + alarm-gpios: > + maxItems: 1 > + > + gpio-fan,speed-map: > + $ref: /schemas/types.yaml#/definitions/uint32-matrix > + minItems: 2 > + maxItems: 127 > + items: > + items: > + - description: fan speed in RPMs > + - description: control value > + description: | > + A mapping of possible fan RPM speeds and the > + control value that should be set to achieve them. This array > + must have the RPM values in ascending order. > + > + '#cooling-cells': > + const: 2 > + > +required: > + - compatible > + - gpios > + - gpio-fan,speed-map > + > +additionalProperties: false > + > +examples: > + - | > + gpio-fan { > + compatible = "gpio-fan"; > + gpios = <&gpio2 14 1 > + &gpio2 13 1>; > + gpio-fan,speed-map = < 0 0>, > + <3000 1>, > + <6000 2>; > + alarm-gpios = <&gpio2 15 1>; > + #cooling-cells = <2>; /* min followed by max */ > + };
From: Thierry Reding <treding@nvidia.com> On Sat, 09 Dec 2023 18:15:39 +0100, David Heidelberg wrote: > Convert fan devices connected to GPIOs to the YAML syntax. > > Applied, thanks! [3/3] ARM: dts: tegra30-ouya: make dts use gpio-fan matrix instead of array (no commit info) Best regards,
diff --git a/Documentation/devicetree/bindings/hwmon/gpio-fan.txt b/Documentation/devicetree/bindings/hwmon/gpio-fan.txt deleted file mode 100644 index f4cfa350f6a1..000000000000 --- a/Documentation/devicetree/bindings/hwmon/gpio-fan.txt +++ /dev/null @@ -1,41 +0,0 @@ -Bindings for fan connected to GPIO lines - -Required properties: -- compatible : "gpio-fan" - -Optional properties: -- gpios: Specifies the pins that map to bits in the control value, - ordered MSB-->LSB. -- gpio-fan,speed-map: A mapping of possible fan RPM speeds and the - control value that should be set to achieve them. This array - must have the RPM values in ascending order. -- alarm-gpios: This pin going active indicates something is wrong with - the fan, and a udev event will be fired. -- #cooling-cells: If used as a cooling device, must be <2> - Also see: - Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml - min and max states are derived from the speed-map of the fan. - -Note: At least one the "gpios" or "alarm-gpios" properties must be set. - -Examples: - - gpio_fan { - compatible = "gpio-fan"; - gpios = <&gpio1 14 1 - &gpio1 13 1>; - gpio-fan,speed-map = <0 0 - 3000 1 - 6000 2>; - alarm-gpios = <&gpio1 15 1>; - }; - gpio_fan_cool: gpio_fan { - compatible = "gpio-fan"; - gpios = <&gpio2 14 1 - &gpio2 13 1>; - gpio-fan,speed-map = <0 0>, - <3000 1>, - <6000 2>; - alarm-gpios = <&gpio2 15 1>; - #cooling-cells = <2>; /* min followed by max */ - }; diff --git a/Documentation/devicetree/bindings/hwmon/gpio-fan.yaml b/Documentation/devicetree/bindings/hwmon/gpio-fan.yaml new file mode 100644 index 000000000000..7f30cfc87350 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/gpio-fan.yaml @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/hwmon/gpio-fan.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Fan connected to GPIO lines + +maintainers: + - Rob Herring <robh@kernel.org> + +properties: + compatible: + const: gpio-fan + + gpios: + description: | + Specifies the pins that map to bits in the control value, + ordered MSB-->LSB. + minItems: 1 + maxItems: 7 + + alarm-gpios: + maxItems: 1 + + gpio-fan,speed-map: + $ref: /schemas/types.yaml#/definitions/uint32-matrix + minItems: 2 + maxItems: 127 + items: + items: + - description: fan speed in RPMs + - description: control value + description: | + A mapping of possible fan RPM speeds and the + control value that should be set to achieve them. This array + must have the RPM values in ascending order. + + '#cooling-cells': + const: 2 + +required: + - compatible + - gpios + - gpio-fan,speed-map + +additionalProperties: false + +examples: + - | + gpio-fan { + compatible = "gpio-fan"; + gpios = <&gpio2 14 1 + &gpio2 13 1>; + gpio-fan,speed-map = < 0 0>, + <3000 1>, + <6000 2>; + alarm-gpios = <&gpio2 15 1>; + #cooling-cells = <2>; /* min followed by max */ + };
Convert fan devices connected to GPIOs to the YAML syntax. Signed-off-by: David Heidelberg <david@ixit.cz> --- v4: - dropped the 1st example - dropped unused label in 2nd example (now 1st example) .../devicetree/bindings/hwmon/gpio-fan.txt | 41 ------------- .../devicetree/bindings/hwmon/gpio-fan.yaml | 60 +++++++++++++++++++ 2 files changed, 60 insertions(+), 41 deletions(-) delete mode 100644 Documentation/devicetree/bindings/hwmon/gpio-fan.txt create mode 100644 Documentation/devicetree/bindings/hwmon/gpio-fan.yaml