Commit 0f974581 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon updates from Guenter Roeck:
 "New drivers:
   - SB-TSI sensors
   - Lineat Technology LTC2992
   - Delta power supplies Q54SJ108A2
   - Maxim MAX127
   - Corsair PSU
   - STMicroelectronics PM6764 Voltage Regulator

  New chip support:
   - P10 added to fsi/occ driver
   - NCT6687D added to nct6883 driver
   - Intel-based Xserves added to applesmc driver
   - AMD family 19h model 01h added to amd_energy driver

  And various minor bug fixes and improvements"

* tag 'hwmon-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (41 commits)
  dt-bindings: (hwmon/sbtsi_temp) Add SB-TSI hwmon driver bindings
  hwmon: (sbtsi) Add documentation
  hwmon: (sbtsi) Add basic support for SB-TSI sensors
  hwmon: (iio_hwmon) Drop bogus __refdata annotation
  hwmon: (xgene) Drop bogus __refdata annotation
  dt-bindings: hwmon: convert AD ADM1275 bindings to dt-schema
  hwmon: (occ) Add new temperature sensor type
  fsi: occ: Add support for P10
  dt-bindings: fsi: Add P10 OCC device documentation
  dt-bindings: hwmon: convert TI ADS7828 bindings to dt-schema
  dt-bindings: hwmon: convert AD AD741x bindings to dt-schema
  dt-bindings: hwmon: convert TI INA2xx bindings to dt-schema
  hwmon: (ltc2992) Fix less than zero comparisons with an unsigned integer
  hwmon: (pmbus/q54sj108a2) Correct title underline length
  dt-bindings: hwmon: Add documentation for ltc2992
  hwmon: (ltc2992) Add support for GPIOs.
  hwmon: (ltc2992) Add support
  hwmon: (pmbus) Driver for Delta power supplies Q54SJ108A2
  hwmon: Add driver for STMicroelectronics PM6764 Voltage Regulator
  hwmon: (nct6683) Support NCT6687D.
  ...
parents ce51c2b7 1a033769

Documentation/devicetree/bindings/fsi/ibm,p9-occ.txt

+6 −6
Original line number Diff line number Diff line 
Device-tree bindings for FSI-attached POWER9 On-Chip Controller (OCC)

---------------------------------------------------------------------

Device-tree bindings for FSI-attached POWER9/POWER10 On-Chip Controller (OCC)

-----------------------------------------------------------------------------



This is the binding for the P9 On-Chip Controller accessed over FSI from a

service processor. See fsi.txt for details on bindings for FSI slave and CFAM

This is the binding for the P9 or P10 On-Chip Controller accessed over FSI from

a service processor. See fsi.txt for details on bindings for FSI slave and CFAM

nodes. The OCC is not an FSI slave device itself, rather it is accessed

through the SBE fifo.

through the SBE FIFO.



Required properties:

 - compatible = "ibm,p9-occ"

 - compatible = "ibm,p9-occ" or "ibm,p10-occ"



Examples:

Documentation/devicetree/bindings/hwmon/ad741x.txt

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
* AD7416/AD7417/AD7418 Temperature Sensor Device Tree Bindings



Required properties:

- compatible: one of

		"adi,ad7416"

		"adi,ad7417"

		"adi,ad7418"

- reg: I2C address



Example:



hwmon@28 {

	compatible = "adi,ad7418";

	reg = <0x28>;

};

Documentation/devicetree/bindings/hwmon/adi,ad741x.yaml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---



$id: http://devicetree.org/schemas/hwmon/adi,ad741x.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Analog Devices AD7416/AD7417/AD7418 temperature sensors



maintainers:

  - Krzysztof Kozlowski <krzk@kernel.org>



properties:

  compatible:

    enum:

      - adi,ad7416

      - adi,ad7417

      - adi,ad7418



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        temperature-sensor@28 {

            compatible = "adi,ad7418";

            reg = <0x28>;

        };

    };

Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---



$id: http://devicetree.org/schemas/hwmon/adi,adm1275.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Analog Devices ADM1075/ADM127x/ADM129x digital power monitors



maintainers:

  - Krzysztof Kozlowski <krzk@kernel.org>



description: |

  The ADM1293 and ADM1294 are high accuracy integrated digital power monitors

  that offer digital current, voltage, and power monitoring using an on-chip,

  12-bit analog-to-digital converter (ADC), communicated through a PMBus

  compliant I2C interface.



  Datasheets:

    https://www.analog.com/en/products/adm1294.html



properties:

  compatible:

    enum:

      - adi,adm1075

      - adi,adm1272

      - adi,adm1275

      - adi,adm1276

      - adi,adm1278

      - adi,adm1293

      - adi,adm1294



  reg:

    maxItems: 1



  shunt-resistor-micro-ohms:

    description:

      Shunt resistor value in micro-Ohm.



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        power-sensor@10 {

            compatible = "adi,adm1272";

            reg = <0x10>;

            shunt-resistor-micro-ohms = <500>;

        };

    };

Documentation/devicetree/bindings/hwmon/adi,ltc2992.yaml

0 → 100644
+80 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/hwmon/adi,ltc2992.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Linear Technology 2992 Power Monitor



maintainers:

  - Alexandru Tachici <alexandru.tachici@analog.com>



description: |

  Linear Technology 2992 Dual Wide Range Power Monitor

  https://www.analog.com/media/en/technical-documentation/data-sheets/ltc2992.pdf



properties:

  compatible:

    enum:

      - adi,ltc2992



  reg:

    maxItems: 1



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



  avcc-supply: true



patternProperties:

  "^channel@([0-1])$":

    type: object

    description: |

      Represents the two supplies to be monitored.



    properties:

      reg:

        description: |

          The channel number. LTC2992 can monitor two supplies.

        items:

          minimum: 0

          maximum: 1



      shunt-resistor-micro-ohms:

        description:

          The value of curent sense resistor in microohms.



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c1 {

        #address-cells = <1>;

        #size-cells = <0>;



        ltc2992@6F {

                #address-cells = <1>;

                #size-cells = <0>;



                compatible = "adi,ltc2992";

                reg = <0x6F>;



                channel@0 {

                        reg = <0x0>;

                        shunt-resistor-micro-ohms = <10000>;

                };



                channel@1 {

                        reg = <0x1>;

                        shunt-resistor-micro-ohms = <10000>;

                };

        };

    };

...

CRA Git | Maintained and supported by SUSTech CRA and CCSE