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

Merge tag 'hwmon-for-v6.14-rc1' of... 

Merge tag 'hwmon-for-v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
 "New drivers:

   - PMBus client driver for Intel CRPS185 power supply

   - PMBus client driver for Texas Instruments TPS25990

  Chip support added to existing drivers:

   - pmbus/max15301: Add support for MAX15303

   - pmbus/adm1275: Add adm1273 support

   - lm75: Add NXP P3T1755 support; with it, add I3C support to the
     driver

   - asus-ec-sensors: Add TUF GAMING X670E PLUS

  Other notable changes:

   - nct6683: Add customer IDs for several MSI and ASRock boards

   - tmp108: Add regulator support

   - Improve write protect support in PMBus core

   - pmbus/dps920ab: Add ability to instantiate through i2c

   - The hwmon core now accepts NULL as device name parameter to
     [devm_]hwmon_device_register_with_info ans uses the parent device
     name as fallback in that case

   - The PMBus core now provides the PMBUs revision in a debugfs file

   - asus-ec-sensors: Support for optional CPU fan on AMD 600
     motherboards

   - raspberrypi: Add PM suspend/resume support

   - dell-smm: Enable manual fan control support on Dell XPS 9370

   - pwm-fan: Default to maximum cooling level if provided

  And various other minor fixes and improvements"

* tag 'hwmon-for-v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (44 commits)
  hwmon: pmbus: dps920ab: Add ability to instantiate through i2c
  hwmon: (pwm-fan) Default to the Maximum cooling level if provided
  hwmon: (asus_atk0110) Use str_enabled_disabled() and str_enable_disable() helpers
  hwmon: Fix help text for aspeed-g6-pwm-tach
  hwmon: (dell-smm) Add Dell XPS 9370 to fan control whitelist
  hwmon: (acpi_power_meter) Fix update the power trip points on failure
  hwmon: (acpi_power_meter) Fix uninitialized variables
  hwmon: (core) Use device name as a fallback in devm_hwmon_device_register_with_info
  hwmon: (pmbus/max15301) Add support for MAX15303
  hwmon: (pmbus/adm1275) add adm1273 support
  dt-bindings: hwmon: adm1275: add adm1273
  hwmon: (nct6683) Add another customer ID for MSI
  hwmon: (pwm-fan): Make use of device properties everywhere
  hwmon: (lm75) add I3C support for P3T1755
  hwmon: (lm75) separate probe into common and I2C parts
  hwmon: (lm75) Remove superfluous 'client' member from private struct
  hwmon: (lm75) simplify regulator handling
  hwmon: (lm75) simplify lm75_write_config()
  hwmon: (lm75) Hide register size differences in regmap access functions
  hwmon: (pmbus/crps) Add Intel CRPS185 power supply
  ...
parents 11a7b033 a76539b2

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

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
    enum:

      - adi,adm1075

      - adi,adm1272

      - adi,adm1273

      - adi,adm1275

      - adi,adm1276

      - adi,adm1278
@@ -79,6 +80,7 @@ allOf: 
          contains:

            enum:

              - adi,adm1272

              - adi,adm1273

    then:

      properties:

        adi,volt-curr-sample-average:

Documentation/devicetree/bindings/hwmon/lm75.yaml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
      - maxim,max31725

      - maxim,max31726

      - maxim,mcp980x

      - nxp,p3t1755

      - nxp,pct2075

      - st,stds75

      - st,stlm75

Documentation/devicetree/bindings/trivial-devices.yaml

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ properties: 
          - injoinic,ip5209

            # Inspur Power System power supply unit version 1

          - inspur,ipsps1

            # Intel common redudant power supply crps185

          - intel,crps185

            # Intersil ISL29028 Ambient Light and Proximity Sensor

          - isil,isl29028

            # Intersil ISL29030 Ambient Light and Proximity Sensor

Documentation/hwmon/adm1275.rst

+18 −10
Original line number Diff line number Diff line
@@ -19,6 +19,14 @@ Supported chips: 


    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1272.pdf



  * Analog Devices ADM1273



    Prefix: 'adm1273'



    Addresses scanned: -



    Datasheet: Not yet publicly available



  * Analog Devices ADM1275



    Prefix: 'adm1275'
@@ -66,14 +74,14 @@ Description 
-----------



This driver supports hardware monitoring for Analog Devices ADM1075, ADM1272,

ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap Controller and

Digital Power Monitors.

ADM1273, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 Hot-Swap

Controller and Digital Power Monitors.



ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and ADM1294 are hot-swap

controllers that allow a circuit board to be removed from or inserted into

a live backplane. They also feature current and voltage readback via an

integrated 12 bit analog-to-digital converter (ADC), accessed using a

PMBus interface.

ADM1075, ADM1272, ADM1273, ADM1275, ADM1276, ADM1278, ADM1281, ADM1293, and

ADM1294 are hot-swap controllers that allow a circuit board to be removed from

or inserted into a live backplane. They also feature current and voltage

readback via an integrated 12 bit analog-to-digital converter (ADC), accessed

using a PMBus interface.



The driver is a client driver to the core PMBus driver. Please see

Documentation/hwmon/pmbus.rst for details on PMBus client drivers.
@@ -141,7 +149,7 @@ power1_input_highest Highest observed input power. 
power1_reset_history	Write any value to reset history.



			Power attributes are supported on ADM1075, ADM1272,

			ADM1276, ADM1293, and ADM1294.

			ADM1273, ADM1276, ADM1293, and ADM1294.



temp1_input		Chip temperature.

temp1_max		Maximum chip temperature.
@@ -151,6 +159,6 @@ temp1_crit_alarm Critical temperature high alarm. 
temp1_highest		Highest observed temperature.

temp1_reset_history	Write any value to reset history.



			Temperature attributes are supported on ADM1272 and

			ADM1278, and ADM1281.

			Temperature attributes are supported on ADM1272,

			ADM1273, ADM1278, and ADM1281.

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

Documentation/hwmon/asus_ec_sensors.rst

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Supported boards: 
 * ROG STRIX Z690-A GAMING WIFI D4

 * ROG ZENITH II EXTREME

 * ROG ZENITH II EXTREME ALPHA

 * TUF GAMING X670E PLUS



Authors:

    - Eugene Shalygin <eugene.shalygin@gmail.com>