Commit 174a86df 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: (dme1737) Minor cleanups
  hwmon: (dme1737) Add support for in7 for SCH5127
  hwmon: (emc1403) Add EMC1423 support
  hwmon: (w83627hf) Document W83627THF voltage pin mapping
  hwmon: (w83793) Drop useless mutex
  hwmon: (fschmd) Drop useless mutex
  hwmon: (w83781d) Use pr_fmt and pr_<level>
  hwmon: (pc87427) Use pr_fmt and pr_<level>
  hwmon: (pc87360) Use pr_fmt and pr_<level>
  hwmon: (lm78) Use pr_fmt and pr_<level>
  hwmon: (it87) Use pr_fmt and pr_<level>
  hwmon: Schedule the removal of the old intrusion detection interfaces
  hwmon: (w83793) Implement the standard intrusion detection interface
  hwmon: (w83792d) Implement the standard intrusion detection interface
  hwmon: (adm9240) Implement the standard intrusion detection interface
  hwmon: (via686a) Initialize fan_div values
  hwmon: (w83795) Silent false warning from gcc
  hwmon: (ads7828) Update email contact details
parents 1896a134 06f3d9fb

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -590,3 +590,13 @@ Why: The functions have been superceded by cancel_delayed_work_sync() 
Who:	Tejun Heo <tj@kernel.org>



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



What:	Legacy, non-standard chassis intrusion detection interface.

When:	June 2011

Why:	The adm9240, w83792d and w83793 hardware monitoring drivers have

	legacy interfaces for chassis intrusion detection. A standard

	interface has been added to each driver, so the legacy interface

	can be removed.

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



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

Documentation/hwmon/adm9240

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ connected to a normally open switch. 
The ADM9240 provides an internal open drain on this line, and may output

a 20 ms active low pulse to reset an external Chassis Intrusion latch.



Clear the CI latch by writing value 1 to the sysfs chassis_clear file.

Clear the CI latch by writing value 0 to the sysfs intrusion0_alarm file.



Alarm flags reported as 16-bit word

Documentation/hwmon/ads7828

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Supported chips: 
               http://focus.ti.com/lit/ds/symlink/ads7828.pdf



Authors:

        Steve Hardy <steve@linuxrealtime.co.uk>

        Steve Hardy <shardy@redhat.com>



Module Parameters

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

Documentation/hwmon/dme1737

+7 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ Description 
This driver implements support for the hardware monitoring capabilities of the

SMSC DME1737 and Asus A8000 (which are the same), SMSC SCH5027, SCH311x,

and SCH5127 Super-I/O chips. These chips feature monitoring of 3 temp sensors

temp[1-3] (2 remote diodes and 1 internal), 7 voltages in[0-6] (6 external and

temp[1-3] (2 remote diodes and 1 internal), 8 voltages in[0-7] (7 external and

1 internal) and up to 6 fan speeds fan[1-6]. Additionally, the chips implement

up to 5 PWM outputs pwm[1-3,5-6] for controlling fan speeds both manually and

automatically.
@@ -105,6 +105,7 @@ SCH5127: 
	in4: V1_IN				0V - 1.5V

	in5: VTR	(+3.3V standby)		0V - 4.38V

	in6: Vbat	(+3.0V)			0V - 4.38V

	in7: Vtrip	(+1.5V)			0V - 1.99V



Each voltage input has associated min and max limits which trigger an alarm

when crossed.
@@ -217,10 +218,10 @@ cpu0_vid RO CPU core reference voltage in 
vrm				RW	Voltage regulator module version

					number.



in[0-6]_input			RO	Measured voltage in millivolts.

in[0-6]_min			RW	Low limit for voltage input.

in[0-6]_max			RW	High limit for voltage input.

in[0-6]_alarm			RO	Voltage input alarm. Returns 1 if

in[0-7]_input			RO	Measured voltage in millivolts.

in[0-7]_min			RW	Low limit for voltage input.

in[0-7]_max			RW	High limit for voltage input.

in[0-7]_alarm			RO	Voltage input alarm. Returns 1 if

					voltage input is or went outside the

					associated min-max range, 0 otherwise.
@@ -324,3 +325,4 @@ fan5 opt opt 
pwm5			opt		opt

fan6			opt		opt

pwm6			opt		opt

in7						yes

Documentation/hwmon/w83627hf

+22 −0
Original line number Diff line number Diff line
@@ -91,3 +91,25 @@ isaset -y -f 0x2e 0xaa 


The above sequence assumes a Super-I/O config space at 0x2e/0x2f, but

0x4e/0x4f is also possible.



Voltage pin mapping

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



Here is a summary of the voltage pin mapping for the W83627THF. This

can be useful to convert data provided by board manufacturers into

working libsensors configuration statements.



    W83627THF		|

  Pin	| Name		| Register	| Sysfs attribute

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

  100	| CPUVCORE	| 20h		| in0

   99	| VIN0		| 21h		| in1

   98	| VIN1		| 22h		| in2

   97	| VIN2		| 24h		| in4

  114	| AVCC		| 23h		| in3

   61	| 5VSB		| 50h (bank 5)	| in7

   74	| VBAT		| 51h (bank 5)	| in8



For other supported devices, you'll have to take the hard path and

look up the information in the datasheet yourself (and then add it

to this document please.)

CRA Git | Maintained and supported by SUSTech CRA and CCSE