Commit 4d03390b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull hwmon updates from Guenter Roeck:
 "New drivers:

   - Driver for OneXPlayer mini AMD sensors

   - Ampere's Altra smpro-hwmon driver

  New chip and attribute support in existing drivers:

   - nct6775: Support for ASUS CROSSHAIR VIII/TUF/ProArt B550M

   - pmbus/ltc2978: Support for LTC7132

   - aquacomputer_d5next: Support for temperature sensor offsets and
     flow sensor pulses

   - coretemp: Support for dynamic ttarget and tjmax

  Improvements:

   - Use devm_regulator_get_enable() where appropriate

   - Use sysfs_emit() instead of scnprintf()

   - Remove some useless #include <linux/hwmon-vid.h>

   - Include <linux/kstrtox.h> when appropriate

   - Use simple i2c probe

   - it87: Check for a valid chip before using force_id, and new new
     module parameter to ignore ACPI resource conflicts

   - jc42: Use regmap, and restore min/max/critical temperatures on
     resume

   - Add reporting power good and status to PMBus based regulators

  Last minute fixes:

   - emc2305: Fix probing of emc2301/2/3, and fix setting pwm values
     manually if THERMAL is enabled

  And various other minor fixes and improvements"

* tag 'hwmon-for-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (37 commits)
  hwmon: (emc2305) fix pwm never being able to set lower
  hwmon: (emc2305) fix unable to probe emc2301/2/3
  hwmon: (dell-smm) Move error message to make probing silent
  hwmon: use sysfs_emit() to instead of scnprintf()
  hwmon: (oxp-sensors) Fix pwm reading
  hwmon: (aquacomputer_d5next) Add support for Quadro flow sensor pulses
  hwmon: (pmbus/core) Implement regulator get_status
  hwmon: (oxp-sensors) Add AOK ZOE and Mini PRO
  hwmon: (gsc-hwmon) Switch to flexible array to simplify code
  hwmon: (pmbus) Add power good support
  hwmon: (nct6775) add ASUS CROSSHAIR VIII/TUF/ProArt B550M
  hwmon: (coretemp) Add support for dynamic ttarget
  hwmon: (coretemp) Add support for dynamic tjmax
  hwmon: (coretemp) rearrange tjmax handing code
  hwmon: Remove some useless #include <linux/hwmon-vid.h>
  hwmon: (coretemp) Remove obsolete temp_data->valid
  hwmon: add OneXPlayer mini AMD sensors driver
  hwmon: (aquacomputer_d5next) Clear up macros and comments
  hwmon: (it87) Add DMI table for future extensions
  hwmon: Include <linux/kstrtox.h> when appropriate
  ...
parents 361c89a0 364ffd25

Documentation/hwmon/aquacomputer_d5next.rst

+3 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ current. 


The Quadro exposes four physical and sixteen virtual temperature sensors, a flow

sensor and four PWM controllable fans, along with their speed (in RPM), power,

voltage and current.

voltage and current. Flow sensor pulses are also available.



The Farbwerk and Farbwerk 360 expose four temperature sensors. Additionally,

sixteen virtual temperature sensors of the Farbwerk 360 are exposed.
@@ -62,7 +62,9 @@ Sysfs entries 


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

temp[1-20]_input Physical/virtual temperature sensors (in millidegrees Celsius)

temp[1-4]_offset Temperature sensor correction offset (in millidegrees Celsius)

fan[1-8]_input   Pump/fan speed (in RPM) / Flow speed (in dL/h)

fan5_pulses      Quadro flow sensor pulses

power[1-8]_input Pump/fan power (in micro Watts)

in[0-7]_input    Pump/fan voltage (in milli Volts)

curr[1-8]_input  Pump/fan current (in milli Amperes)

Documentation/hwmon/index.rst

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ Hardware Monitoring Kernel Drivers 
   nzxt-kraken2

   nzxt-smart2

   occ

   oxp-sensors

   pc87360

   pc87427

   pcf8591
@@ -187,6 +188,7 @@ Hardware Monitoring Kernel Drivers 
   sis5595

   sl28cpld

   smm665

   smpro-hwmon

   smsc47b397

   smsc47m192

   smsc47m1

Documentation/hwmon/oxp-sensors.rst

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



Kernel driver oxp-sensors

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



Author:

    - Joaquín Ignacio Aramendía <samsagax@gmail.com>



Description:

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



One X Player devices from One Netbook provide fan readings and fan control

through its Embedded Controller.



Currently only supports AMD boards from the One X Player and AOK ZOE lineup.

Intel boards could be supported if we could figure out the EC registers and

values to write to since the EC layout and model is different.



Supported devices

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



Currently the driver supports the following handhelds:



 - AOK ZOE A1

 - OneXPlayer AMD

 - OneXPlayer mini AMD

 - OneXPlayer mini AMD PRO



Sysfs entries

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



The following attributes are supported:



fan1_input

  Read Only. Reads current fan RMP.



pwm1_enable

  Read Write. Enable manual fan control. Write "1" to set to manual, write "0"

  to let the EC control de fan speed. Read this attribute to see current status.



pwm1

  Read Write. Read this attribute to see current duty cycle in the range [0-255].

  When pwm1_enable is set to "1" (manual) write any value in the range [0-255]

  to set fan speed.

Documentation/hwmon/smpro-hwmon.rst

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



Kernel driver Ampere(R)'s Altra(R) SMpro hwmon

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



Supported chips:



  * Ampere(R) Altra(R)



    Prefix: ``smpro``



    Reference: `Altra SoC BMC Interface Specification`



Author: Thu Nguyen <thu@os.amperecomputing.com>



Description

-----------

The smpro-hwmon driver supports hardware monitoring for Ampere(R) Altra(R)

SoCs based on the SMpro co-processor (SMpro).  The following sensor metrics

are supported by the driver:



  * temperature

  * voltage

  * current

  * power



The interface provides the registers to query the various sensors and

their values which are then exported to userspace by this driver.



Usage Notes

-----------



The driver creates at least two sysfs files for each sensor.



* ``<sensor_type><idx>_label`` reports the sensor label.

* ``<sensor_type><idx>_input`` returns the sensor value.



The sysfs files are allocated in the SMpro rootfs folder, with one root

directory for each instance.



When the SoC is turned off, the driver will fail to read registers and

return ``-ENXIO``.



Sysfs entries

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



The following sysfs files are supported:



* Ampere(R) Altra(R):



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

  Name            Unit           Perm    Description

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

  temp1_input     millicelsius   RO      SoC temperature

  temp2_input     millicelsius   RO      Max temperature reported among SoC VRDs

  temp2_crit      millicelsius   RO      SoC VRD HOT Threshold temperature

  temp3_input     millicelsius   RO      Max temperature reported among DIMM VRDs

  temp4_input     millicelsius   RO      Max temperature reported among Core VRDs

  temp5_input     millicelsius   RO      Temperature of DIMM0 on CH0

  temp5_crit      millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp6_input     millicelsius   RO      Temperature of DIMM0 on CH1

  temp6_crit      millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp7_input     millicelsius   RO      Temperature of DIMM0 on CH2

  temp7_crit      millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp8_input     millicelsius   RO      Temperature of DIMM0 on CH3

  temp8_crit      millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp9_input     millicelsius   RO      Temperature of DIMM0 on CH4

  temp9_crit      millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp10_input    millicelsius   RO      Temperature of DIMM0 on CH5

  temp10_crit     millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp11_input    millicelsius   RO      Temperature of DIMM0 on CH6

  temp11_crit     millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp12_input    millicelsius   RO      Temperature of DIMM0 on CH7

  temp12_crit     millicelsius   RO      MEM HOT Threshold for all DIMMs

  temp13_input    millicelsius   RO      Max temperature reported among RCA VRDs

  in0_input       millivolts     RO      Core voltage

  in1_input       millivolts     RO      SoC voltage

  in2_input       millivolts     RO      DIMM VRD1 voltage

  in3_input       millivolts     RO      DIMM VRD2 voltage

  in4_input       millivolts     RO      RCA VRD voltage

  cur1_input      milliamperes   RO      Core VRD current

  cur2_input      milliamperes   RO      SoC VRD current

  cur3_input      milliamperes   RO      DIMM VRD1 current

  cur4_input      milliamperes   RO      DIMM VRD2 current

  cur5_input      milliamperes   RO      RCA VRD current

  power1_input    microwatts     RO      Core VRD power

  power2_input    microwatts     RO      SoC VRD power

  power3_input    microwatts     RO      DIMM VRD1 power

  power4_input    microwatts     RO      DIMM VRD2 power

  power5_input    microwatts     RO      RCA VRD power

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



  Example::



    # cat in0_input

    830

    # cat temp1_input

    37000

    # cat curr1_input

    9000

    # cat power5_input

    19500000

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -15452,6 +15452,12 @@ S: Maintained 
F:	drivers/mtd/nand/onenand/

F:	include/linux/mtd/onenand*.h









ONEXPLAYER FAN DRIVER









M:	Joaquín Ignacio Aramendía <samsagax@gmail.com>









L:	linux-hwmon@vger.kernel.org









S:	Maintained









F:	drivers/hwmon/oxp-sensors.c

















ONION OMEGA2+ BOARD









M:	Harvey Hunt <harveyhuntnexus@gmail.com>









L:	linux-mips@vger.kernel.org