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

Pull hwmon updates from Guenter Roeck:
 "New drivers:
   - Axiado AX3000 and AX3005 PWM fan controller
   - AX3000/AX3005 TSADC
   - HONOR FMI-XX
   - Minisforum UM780 XTX EC monitoring and fan control
   - pmbus: MAX20826, MAX20855B, MAX20908, MAX20912, MAX20826, and
     MAX20916
   - pmbus: Infineon TDA38740/TDA38725

  Added support to existing drivers:
   - asus-ec-sensors: ROG STRIX X670E-A GAMING WIFI and ROG STRIX Z490-A
     GAMING
   - asus_rog_ryujin: ROG Ryujin III 360
   - dell-smm: Dell 16 DC16250, Dell OptiPlex 7090, Dell Precision 3650
     Tower, Add Latitude 5420
   - it87: IT8613E
   - k10temp: 1ah/80h devices. Drop support for Hygon devices (support
     to be re-added with separate patches later)
   - lm63: Sensylink CTF2301
   - nct6683: MSI MAG B550M MORTAR MAX WIFI, MSI MAG B650 TOMAHAWK WIFI,
     MSI MAG B650M MORTAR WIFI (MS-7D76), and MSI MAG B850M MORTAR WIFI
   - nct6775: NCT6122D and NCT6126D
   - pmbus/isl68137: Renesas RAA229639 and RAA229640
   - pmbus/max34440: ADPM12300
   - pmbus/tps25990: TPS1689
   - pmbus/tps53679: TPS53622, TPS53659 and TPS536C7
   - pmbus/xdpe1a2g7b: xdpe1a2g7c
   - sht4x: Sensirion STS4x
   - socfpga: Agilex 5
   - yogafan: Lenovo Yoga Pro 9 16IMH9, Yoga 14cACN 2021, IdeaPad 3
     15ALC6 Ub, Yoga 740-15IML

  Core updates:
   - Support for currX_emergency and inX_[l]emergency attributes

  Notable bug fixes and changes:
   - Add missing locks to corsair-cpro, ftsteutates, nct7904, and
     npcm750-pwm-fan drivers
   - Fix jiffies wraparound in tmp102 and tmp108 drivers
   - Documentation updates (document missing chip support, typo fixes,
     clarifications)
   - pmbus/ltc4286: Add writable shunt_resistor sysfs attribute
   - coretemp: Document sysfs numbering and label meaning, fix handling
     of isolated SMT siblings, read TjMax only when refreshing the
     temperature, refresh the temperature on the first read, and return
     -ENODATA for invalid temperature readings
   - spd5118: Avoid probing when 16-bit addressing is enabled, and
     select page 0 unconditionally during probe
   - arctic_fan_controller: Default PWM cache to MCU 40%, Dual-license
     GPL-2.0-or-later OR BSD-2-Clause, and update maintainer address

  Various other minor bug fixes and improvements"

* tag 'hwmon-for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (97 commits)
  hwmon: (npcm750-pwm-fan) serialize PWM register updates
  hwmon: (nct7904) serialise the watchdog and sensors
  hwmon: (ftsteutates) serialise the watchdog and sensors
  hwmon: (acpi_power_meter) Fix 18.45 TW bug
  hwmon: (sht3x) Return the consumed count for heater writes
  hwmon: (mcp9982) Update the interval cache only after successful writes
  hwmon: (gigabyte_waterforce) reject short input reports
  hwmon: (coretemp) Fix handling of isolated SMT siblings
  hwmon: (coretemp) Document sysfs numbering and label meaning
  hwmon: (asus_wmi_sensors) Reword BIOS upgrade advice
  hwmon: Replace __MODULE_STRING() with __stringify()
  hwmon:(pmbus/xdpe1a2g7b) Add support for xdpe1a2g7c controller
  dt-bindings: trivial-devices: Add support for XDPE1A2G7C
  hwmon: (pmbus/isl68137) Add Renesas RAA229639 and RAA229640
  dt-bindings: hwmon: pmbus/isl68137: Add Renesas RAA229639 and RAA229640
  hwmon: (coretemp) Read TjMax only when refreshing the temperature
  hwmon: (pmbus/ibm-cffps) Avoid format truncation warnings
  hwmon: (dell-smm) Add Dell 16 DC16250 to fan control whitelist
  hwmon: (nct6683) Add more MSI boards to list of tested boards
  hwmon: (nct6683) Add MSI B850M to list of tested boards
  ...

1 files changed, 12 insertions, 0 deletions

diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index dd713e193d0c..a3a7d27f3b5f 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -134,6 +134,8 @@ enum hwmon_in_attributes {
 	hwmon_in_max,
 	hwmon_in_lcrit,
 	hwmon_in_crit,
+	hwmon_in_lemergency,
+	hwmon_in_emergency,
 	hwmon_in_average,
 	hwmon_in_lowest,
 	hwmon_in_highest,
@@ -144,6 +146,8 @@ enum hwmon_in_attributes {
 	hwmon_in_max_alarm,
 	hwmon_in_lcrit_alarm,
 	hwmon_in_crit_alarm,
+	hwmon_in_lemergency_alarm,
+	hwmon_in_emergency_alarm,
 	hwmon_in_rated_min,
 	hwmon_in_rated_max,
 	hwmon_in_beep,
@@ -156,6 +160,8 @@ enum hwmon_in_attributes {
 #define HWMON_I_MAX		BIT(hwmon_in_max)
 #define HWMON_I_LCRIT		BIT(hwmon_in_lcrit)
 #define HWMON_I_CRIT		BIT(hwmon_in_crit)
+#define HWMON_I_LEMERGENCY	BIT(hwmon_in_lemergency)
+#define HWMON_I_EMERGENCY	BIT(hwmon_in_emergency)
 #define HWMON_I_AVERAGE		BIT(hwmon_in_average)
 #define HWMON_I_LOWEST		BIT(hwmon_in_lowest)
 #define HWMON_I_HIGHEST		BIT(hwmon_in_highest)
@@ -166,6 +172,8 @@ enum hwmon_in_attributes {
 #define HWMON_I_MAX_ALARM	BIT(hwmon_in_max_alarm)
 #define HWMON_I_LCRIT_ALARM	BIT(hwmon_in_lcrit_alarm)
 #define HWMON_I_CRIT_ALARM	BIT(hwmon_in_crit_alarm)
+#define HWMON_I_LEMERGENCY_ALARM BIT(hwmon_in_lemergency_alarm)
+#define HWMON_I_EMERGENCY_ALARM	BIT(hwmon_in_emergency_alarm)
 #define HWMON_I_RATED_MIN	BIT(hwmon_in_rated_min)
 #define HWMON_I_RATED_MAX	BIT(hwmon_in_rated_max)
 #define HWMON_I_BEEP		BIT(hwmon_in_beep)
@@ -178,6 +186,7 @@ enum hwmon_curr_attributes {
 	hwmon_curr_max,
 	hwmon_curr_lcrit,
 	hwmon_curr_crit,
+	hwmon_curr_emergency,
 	hwmon_curr_average,
 	hwmon_curr_lowest,
 	hwmon_curr_highest,
@@ -188,6 +197,7 @@ enum hwmon_curr_attributes {
 	hwmon_curr_max_alarm,
 	hwmon_curr_lcrit_alarm,
 	hwmon_curr_crit_alarm,
+	hwmon_curr_emergency_alarm,
 	hwmon_curr_rated_min,
 	hwmon_curr_rated_max,
 	hwmon_curr_beep,
@@ -199,6 +209,7 @@ enum hwmon_curr_attributes {
 #define HWMON_C_MAX		BIT(hwmon_curr_max)
 #define HWMON_C_LCRIT		BIT(hwmon_curr_lcrit)
 #define HWMON_C_CRIT		BIT(hwmon_curr_crit)
+#define HWMON_C_EMERGENCY	BIT(hwmon_curr_emergency)
 #define HWMON_C_AVERAGE		BIT(hwmon_curr_average)
 #define HWMON_C_LOWEST		BIT(hwmon_curr_lowest)
 #define HWMON_C_HIGHEST		BIT(hwmon_curr_highest)
@@ -209,6 +220,7 @@ enum hwmon_curr_attributes {
 #define HWMON_C_MAX_ALARM	BIT(hwmon_curr_max_alarm)
 #define HWMON_C_LCRIT_ALARM	BIT(hwmon_curr_lcrit_alarm)
 #define HWMON_C_CRIT_ALARM	BIT(hwmon_curr_crit_alarm)
+#define HWMON_C_EMERGENCY_ALARM	BIT(hwmon_curr_emergency_alarm)
 #define HWMON_C_RATED_MIN	BIT(hwmon_curr_rated_min)
 #define HWMON_C_RATED_MAX	BIT(hwmon_curr_rated_max)
 #define HWMON_C_BEEP		BIT(hwmon_curr_beep)