Commit 7b6e48df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v7.0-rc3' of... 

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

Pull hwmon fixes from Guenter Roeck:

 - Fix initialization commands for AHT20

 - Correct a malformed email address (emc1403)

 - Check the it87_lock() return value

 - Fix inverted polarity (max6639)

 - Fix overflows, underflows, sign extension, and other problems in
   macsmc

 - Fix stack overflow in debugfs read (pmbus/q54sj108a2)

 - Drop support for SMARC-sAM67 (discontinued and never released to
   market)

* tag 'hwmon-for-v7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (pmbus/q54sj108a2) fix stack overflow in debugfs read
  hwmon: (max6639) fix inverted polarity
  dt-bindings: hwmon: sl28cpld: Drop sa67mcu compatible
  hwmon: (it87) Check the it87_lock() return value
  Revert "hwmon: add SMARC-sAM67 support"
  hwmon: (aht10) Fix initialization commands for AHT20
  hwmon: (emc1403) correct a malformed email address
  hwmon: (macsmc) Fix overflows, underflows, and sign extension
  hwmon: (macsmc) Fix regressions in Apple Silicon SMC hwmon driver
parents e33aafac 25dd70a0

Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ description: | 
properties:

  compatible:

    enum:

      - kontron,sa67mcu-hwmon

      - kontron,sl28cpld-fan



  reg:

Documentation/hwmon/emc1403.rst

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ Supported chips: 
	- https://ww1.microchip.com/downloads/en/DeviceDoc/EMC1438%20DS%20Rev.%201.0%20(04-29-10).pdf



Author:

    Kalhan Trisal <kalhan.trisal@intel.com

    Kalhan Trisal <kalhan.trisal@intel.com>





Description

Documentation/hwmon/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ Hardware Monitoring Kernel Drivers 
   q54sj108a2

   qnap-mcu-hwmon

   raspberrypi-hwmon

   sa67

   sbrmi

   sbtsi_temp

   sch5627

Documentation/hwmon/sa67.rst

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



Kernel driver sa67mcu

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



Supported chips:



   * Kontron sa67mcu



     Prefix: 'sa67mcu'



     Datasheet: not available



Authors: Michael Walle <mwalle@kernel.org>



Description

-----------



The sa67mcu is a board management controller which also exposes a hardware

monitoring controller.



The controller has two voltage and one temperature sensor. The values are

hold in two 8 bit registers to form one 16 bit value. Reading the lower byte

will also capture the high byte to make the access atomic. The unit of the

volatge sensors are 1mV and the unit of the temperature sensor is 0.1degC.



Sysfs entries

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



The following attributes are supported.



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

in0_label		"VDDIN"

in0_input		Measured VDDIN voltage.



in1_label		"VDD_RTC"

in1_input		Measured VDD_RTC voltage.



temp1_input		MCU temperature. Roughly the board temperature.

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

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -24320,7 +24320,6 @@ F: Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc. 
F:	Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml

F:	Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml

F:	drivers/gpio/gpio-sl28cpld.c

F:	drivers/hwmon/sa67mcu-hwmon.c

F:	drivers/hwmon/sl28cpld-hwmon.c

F:	drivers/irqchip/irq-sl28cpld.c

F:	drivers/pwm/pwm-sl28cpld.c