Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 750e0699 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (lm78) Become the maintainer
  hwmon: (lm78) Make ISA interface depend on CONFIG_ISA
  hwmon: (lm78) Avoid forward declarations
  hwmon: (sht15) Correct a comment mistake
  hwmon: (max1111) Avoid extra memory allocations
  hwmon: (it87) Add chassis intrusion detection support
  hwmon: (via-cputemp) Add VID reporting support
  hwmon-vid: Add support for VIA family 6 model D CPU
  hwmon: New driver sch5636
  hwmon: (sch5627) Factor out some code shared with sch5636 driver
parents d3ec4844 156e2d1a

Documentation/hwmon/it87

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ IT8718F, IT8720F, IT8721F, IT8726F, IT8758E and SiS950 chips. 
These chips are 'Super I/O chips', supporting floppy disks, infrared ports,

joysticks and other miscellaneous stuff. For hardware monitoring, they

include an 'environment controller' with 3 temperature sensors, 3 fan

rotation speed sensors, 8 voltage sensors, and associated alarms.

rotation speed sensors, 8 voltage sensors, associated alarms, and chassis

intrusion detection.



The IT8712F and IT8716F additionally feature VID inputs, used to report

the Vcore voltage of the processor. The early IT8712F have 5 VID pins,

Documentation/hwmon/lm78

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ Supported chips: 
    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/



Author: Frodo Looijaard <frodol@dds.nl>

Authors: Frodo Looijaard <frodol@dds.nl>

         Jean Delvare <khali@linux-fr.org>



Description

-----------

Documentation/hwmon/sch5636

0 → 100644
+31 −0
Original line number Diff line number Diff line 
Kernel driver sch5636

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



Supported chips:

  * SMSC SCH5636

    Prefix: 'sch5636'

    Addresses scanned: none, address read from Super I/O config space



Author: Hans de Goede <hdegoede@redhat.com>





Description

-----------



SMSC SCH5636 Super I/O chips include an embedded microcontroller for

hardware monitoring solutions, allowing motherboard manufacturers to create

their own custom hwmon solution based upon the SCH5636.



Currently the sch5636 driver only supports the Fujitsu Theseus SCH5636 based

hwmon solution. The sch5636 driver runs a sanity check on loading to ensure

it is dealing with a Fujitsu Theseus and not with another custom SCH5636 based

hwmon solution.



The Fujitsu Theseus can monitor up to 5 voltages, 8 fans and 16

temperatures. Note that the driver detects how many fan headers /

temperature sensors are actually implemented on the motherboard, so you will

likely see fewer temperature and fan inputs.



An application note describing the Theseus' registers, as well as an

application note describing the protocol for communicating with the

microcontroller is available upon request. Please mail me if you want a copy.

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -3960,6 +3960,13 @@ L: lm-sensors@lm-sensors.org 
S:	Maintained

F:	drivers/hwmon/lm73.c



LM78 HARDWARE MONITOR DRIVER

M:	Jean Delvare <khali@linux-fr.org>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/lm78

F:	drivers/hwmon/lm78.c



LM83 HARDWARE MONITOR DRIVER

M:	Jean Delvare <khali@linux-fr.org>

L:	lm-sensors@lm-sensors.org

drivers/hwmon/Kconfig

+21 −0
Original line number Diff line number Diff line
@@ -1041,8 +1041,13 @@ config SENSORS_SMSC47B397 
	  This driver can also be built as a module.  If so, the module

	  will be called smsc47b397.



config SENSORS_SCH56XX_COMMON

	tristate

	default n



config SENSORS_SCH5627

	tristate "SMSC SCH5627"

	select SENSORS_SCH56XX_COMMON

	help

	  If you say yes here you get support for the hardware monitoring

	  features of the SMSC SCH5627 Super-I/O chip.
@@ -1050,6 +1055,21 @@ config SENSORS_SCH5627 
	  This driver can also be built as a module.  If so, the module

	  will be called sch5627.



config SENSORS_SCH5636

	tristate "SMSC SCH5636"

	select SENSORS_SCH56XX_COMMON

	help

	  SMSC SCH5636 Super I/O chips include an embedded microcontroller for

	  hardware monitoring solutions, allowing motherboard manufacturers to

	  create their own custom hwmon solution based upon the SCH5636.



	  Currently this driver only supports the Fujitsu Theseus SCH5636 based

	  hwmon solution. Say yes here if you want support for the Fujitsu

	  Theseus' hardware monitoring features.



	  This driver can also be built as a module.  If so, the module

	  will be called sch5636.



config SENSORS_ADS1015

	tristate "Texas Instruments ADS1015"

	depends on I2C
@@ -1142,6 +1162,7 @@ config SENSORS_TWL4030_MADC 
config SENSORS_VIA_CPUTEMP

	tristate "VIA CPU temperature sensor"

	depends on X86

	select HWMON_VID

	help

	  If you say yes here you get support for the temperature

	  sensor inside your CPU. Supported are all known variants of