Commit a26a9d8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:
   - Texas Instruments TPS23861 driver
   - AHT10 Temperature and Humidity Sensor Driver

  Support for new chips/variants to existing drivers:
   - Add AMD family 19h model 30h x86 match to amd_energy driver
   - Add Zen3 Ryzen Desktop CPUs support to k10temp driver
   - Add support for MAX16508 to max16601 driver
   - Support revision "B" of max31785
   - Add support for ASRock boards to nct6683 driver

  Driver removals:
   - Decomission abx500 driver

  Various other minor fixes and improvements"

* tag 'hwmon-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (30 commits)
  MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE
  hwmon: add Texas Instruments TPS23861 driver
  dt-bindings: hwmon: Add TI TPS23861 bindings
  hwmon: (da9052) Switch to using the new API kobj_to_dev()
  hwmon: (amd_energy) Add AMD family 19h model 30h x86 match
  hwmon: (pmbus/max31785) Support revision "B"
  hwmon: (pmbus/lm25066) Remove unnecessary pmbus_clear_cache function call
  hwmon: (pmbus) Clear sensor data after chip write
  hwmon: (pmbus/max16601) Add support for MAX16508
  hwmon: (pmbus/max16601) Determine and use number of populated phases
  hwmon: (pmbus) Simplify the calculation of variables
  hwmon: (aht10) Unlock on error in aht10_read_values()
  hwmon: (pwm-fan) stop using legacy PWM functions and some cleanups
  hwmon: Add AHT10 Temperature and Humidity Sensor Driver
  hwmon: (applesmc) Assign boolean values to a bool variable
  hwmon: (nct6683) Support ASRock boards
  hwmon: (aspeed-pwm-tacho) Switch to using the new API kobj_to_dev()
  hwmon: (max6650) Switch to using the new API kobj_to_dev()
  hwmon: (pwm-fan) Support multiple fan tachometers
  hwmon: (pwm-fan) Store tach data separately
  ...
parents 983e4ada 6ab3332c

Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml

0 → 100644
+51 −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/ti,tps23861.yaml#

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



title: TI TPS23861 PoE PSE



maintainers:

  - Robert Marko <robert.marko@sartura.hr>



description: |

  The TPS23861 is a IEEE 802.3at Quad Port Power-over-Ethernet PSE Controller.



  Datasheets:

  https://www.ti.com/lit/gpn/tps23861





properties:

  compatible:

    enum:

      - ti,tps23861



  reg:

    maxItems: 1



  shunt-resistor-micro-ohms:

    description: The value of curent sense resistor in microohms.

    default: 255000

    minimum: 250000

    maximum: 255000



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

          #address-cells = <1>;

          #size-cells = <0>;



          tps23861@30 {

              compatible = "ti,tps23861";

              reg = <0x30>;

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

          };

    };

Documentation/hwmon/ab8500.rst

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
Kernel driver ab8500

====================



Supported chips:



  * ST-Ericsson AB8500



    Prefix: 'ab8500'



    Addresses scanned: -



    Datasheet: http://www.stericsson.com/developers/documentation.jsp



Authors:

	- Martin Persson <martin.persson@stericsson.com>

	- Hongbo Zhang <hongbo.zhang@linaro.org>



Description

-----------



See also Documentation/hwmon/abx500.rst. This is the ST-Ericsson AB8500 specific

driver.



Currently only the AB8500 internal sensor and one external sensor for battery

temperature are monitored. Other GPADC channels can also be monitored if needed

in future.

Documentation/hwmon/abx500.rst

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
Kernel driver abx500

====================



Supported chips:



  * ST-Ericsson ABx500 series



    Prefix: 'abx500'



    Addresses scanned: -



    Datasheet: http://www.stericsson.com/developers/documentation.jsp



Authors:

	Martin Persson <martin.persson@stericsson.com>

	Hongbo Zhang <hongbo.zhang@linaro.org>



Description

-----------



Every ST-Ericsson Ux500 SOC consists of both ABx500 and DBx500 physically,

this is kernel hwmon driver for ABx500.



There are some GPADCs inside ABx500 which are designed for connecting to

thermal sensors, and there is also a thermal sensor inside ABx500 too, which

raises interrupt when critical temperature reached.



This abx500 is a common layer which can monitor all of the sensors, every

specific abx500 chip has its special configurations in its own file, e.g. some

sensors can be configured invisible if they are not available on that chip, and

the corresponding gpadc_addr should be set to 0, thus this sensor won't be

polled.

Documentation/hwmon/aht10.rst

0 → 100644
+46 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



Kernel driver aht10

=====================



Supported chips:



  * Aosong AHT10



    Prefix: 'aht10'



    Addresses scanned: None



    Datasheet:



      Chinese: http://www.aosong.com/userfiles/files/media/AHT10%E4%BA%A7%E5%93%81%E6%89%8B%E5%86%8C%20A3%2020201210.pdf

      English: https://server4.eca.ir/eshop/AHT10/Aosong_AHT10_en_draft_0c.pdf



Author: Johannes Cornelis Draaijer <jcdra1@gmail.com>





Description

-----------



The AHT10 is a Temperature and Humidity sensor



The address of this i2c device may only be 0x38



Usage Notes

-----------



This driver does not probe for AHT10 devices, as there is no reliable

way to determine if an i2c chip is or isn't an AHT10. The device has

to be instantiated explicitly with the address 0x38. See

Documentation/i2c/instantiating-devices.rst for details.



Sysfs entries

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



=============== ============================================

temp1_input     Measured temperature in millidegrees Celcius

humidity1_input Measured humidity in %H

update_interval The minimum interval for polling the sensor,

                in milliseconds. Writable. Must be at

                least 2000.

=============== ============================================

Documentation/hwmon/ina2xx.rst

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ bus supply voltage. 


The shunt value in micro-ohms can be set via platform data or device tree at

compile-time or via the shunt_resistor attribute in sysfs at run-time. Please

refer to the Documentation/devicetree/bindings/hwmon/ina2xx.txt for bindings

refer to the Documentation/devicetree/bindings/hwmon/ti,ina2xx.yaml for bindings

if the device tree is used.



Additionally ina226 supports update_interval attribute as described in