Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (d310ad0c) · Commits · 戴 / test

Documentation/hwmon/emc2103

0 → 100644

+33 −0

Original line number	Original line	Diff line number	Diff line
			Kernel driver emc2103
			======================

			Supported chips:
			* SMSC EMC2103
			Addresses scanned: I2C 0x2e
			Prefix: 'emc2103'
			Datasheet: Not public

			Authors:
			Steve Glendinning <steve.glendinning@smsc.com>

			Description
			-----------

			The Standard Microsystems Corporation (SMSC) EMC2103 chips
			contain up to 4 temperature sensors and a single fan controller.

			Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
			triggered if the rotation speed has dropped below a programmable limit. Fan
			readings can be divided by a programmable divider (1, 2, 4 or 8) to give
			the readings more range or accuracy. Not all RPM values can accurately be
			represented, so some rounding is done. With a divider of 1, the lowest
			representable value is 480 RPM.

			This driver supports RPM based control, to use this a fan target
			should be written to fan1_target and pwm1_enable should be set to 3.

			The 2103-2 and 2103-4 variants have a third temperature sensor, which can
			be connected to two anti-parallel diodes. These values can be read
			as temp3 and temp4. If only one diode is attached to this channel, temp4
			will show as "fault". The module parameter "apd=0" can be used to suppress
			this 4th channel when anti-parallel diodes are not fitted.

Documentation/hwmon/ltc4245

+23 −1

Original line number	Original line	Diff line number	Diff line
	@@ -72,9 +72,31 @@ in6_min_alarm 5v output undervoltage alarm
	in7_min_alarm 3v output undervoltage alarm		in7_min_alarm 3v output undervoltage alarm
	in8_min_alarm Vee (-12v) output undervoltage alarm		in8_min_alarm Vee (-12v) output undervoltage alarm

	in9_input GPIO voltage data		in9_input GPIO voltage data (see note 1)
			in10_input GPIO voltage data (see note 1)
			in11_input GPIO voltage data (see note 1)

	power1_input 12v power usage (mW)		power1_input 12v power usage (mW)
	power2_input 5v power usage (mW)		power2_input 5v power usage (mW)
	power3_input 3v power usage (mW)		power3_input 3v power usage (mW)
	power4_input Vee (-12v) power usage (mW)		power4_input Vee (-12v) power usage (mW)


			Note 1
			------

			If you have NOT configured the driver to sample all GPIO pins as analog
			voltages, then the in10_input and in11_input sysfs attributes will not be
			created. The driver will sample the GPIO pin that is currently connected to the
			ADC as an analog voltage, and report the value in in9_input.

			If you have configured the driver to sample all GPIO pins as analog voltages,
			then they will be sampled in round-robin fashion. If userspace reads too
			slowly, -EAGAIN will be returned when you read the sysfs attribute containing
			the sensor reading.

			The LTC4245 chip can be configured to sample all GPIO pins with two methods:
			1) platform data -- see include/linux/i2c/ltc4245.h
			2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip

			The default mode of operation is to sample a single GPIO pin.

Documentation/hwmon/pc87427

+24 −3

Original line number	Original line	Diff line number	Diff line
	@@ -18,10 +18,11 @@ Description

	The National Semiconductor Super I/O chip includes complete hardware		The National Semiconductor Super I/O chip includes complete hardware
	monitoring capabilities. It can monitor up to 18 voltages, 8 fans and		monitoring capabilities. It can monitor up to 18 voltages, 8 fans and
	6 temperature sensors. Only the fans are supported at the moment.		6 temperature sensors. Only the fans and temperatures are supported at
			the moment, voltages aren't.

	This chip also has fan controlling features, which are not yet supported		This chip also has fan controlling features (up to 4 PWM outputs),
	by this driver either.		which are partly supported by this driver.

	The driver assumes that no more than one chip is present, which seems		The driver assumes that no more than one chip is present, which seems
	reasonable.		reasonable.
	@@ -36,3 +37,23 @@ signal. Speeds down to 83 RPM can be measured.
	An alarm is triggered if the rotation speed drops below a programmable		An alarm is triggered if the rotation speed drops below a programmable
	limit. Another alarm is triggered if the speed is too low to be measured		limit. Another alarm is triggered if the speed is too low to be measured
	(including stalled or missing fan).		(including stalled or missing fan).


			Fan Speed Control
			-----------------

			Fan speed can be controlled by PWM outputs. There are 4 possible modes:
			always off, always on, manual and automatic. The latter isn't supported
			by the driver: you can only return to that mode if it was the original
			setting, and the configuration interface is missing.


			Temperature Monitoring
			----------------------

			The PC87427 relies on external sensors (following the SensorPath
			standard), so the resolution and range depend on the type of sensor
			connected. The integer part can be 8-bit or 9-bit, and can be signed or
			not. I couldn't find a way to figure out the external sensor data
			temperature format, so user-space adjustment (typically by a factor 2)
			may be required.

Documentation/hwmon/sysfs-interface

+24 −5

Original line number	Original line	Diff line number	Diff line
	@@ -107,10 +107,24 @@ in[0-*]_min Voltage min value.
	Unit: millivolt		Unit: millivolt
	RW		RW

			in[0-*]_lcrit Voltage critical min value.
			Unit: millivolt
			RW
			If voltage drops to or below this limit, the system may
			take drastic action such as power down or reset. At the very
			least, it should report a fault.

	in[0-*]_max Voltage max value.		in[0-*]_max Voltage max value.
	Unit: millivolt		Unit: millivolt
	RW		RW

			in[0-*]_crit Voltage critical max value.
			Unit: millivolt
			RW
			If voltage reaches or exceeds this limit, the system may
			take drastic action such as power down or reset. At the very
			least, it should report a fault.

	in[0-*]_input Voltage input value.		in[0-*]_input Voltage input value.
	Unit: millivolt		Unit: millivolt
	RO		RO
	@@ -284,7 +298,7 @@ temp[1-*]_input Temperature input value.
	Unit: millidegree Celsius		Unit: millidegree Celsius
	RO		RO

	temp[1-*]_crit Temperature critical value, typically greater than		temp[1-*]_crit Temperature critical max value, typically greater than
	corresponding temp_max values.		corresponding temp_max values.
	Unit: millidegree Celsius		Unit: millidegree Celsius
	RW		RW
	@@ -296,6 +310,11 @@ temp[1-*]_crit_hyst
	from the critical value.		from the critical value.
	RW		RW

			temp[1-*]_lcrit Temperature critical min value, typically lower than
			corresponding temp_min values.
			Unit: millidegree Celsius
			RW

	temp[1-*]_offset		temp[1-*]_offset
	Temperature offset which is added to the temperature reading		Temperature offset which is added to the temperature reading
	by the chip.		by the chip.
	@@ -344,9 +363,6 @@ Also see the Alarms section for status flags associated with temperatures.
	* Currents *		* Currents *
	************		************

	Note that no known chip provides current measurements as of writing,
	so this part is theoretical, so to say.

	curr[1-*]_max Current max value		curr[1-*]_max Current max value
	Unit: milliampere		Unit: milliampere
	RW		RW
	@@ -471,6 +487,7 @@ limit-related alarms, not both. The driver should just reflect the hardware
	implementation.		implementation.

	in[0-*]_alarm		in[0-*]_alarm
			curr[1-*]_alarm
	fan[1-*]_alarm		fan[1-*]_alarm
	temp[1-*]_alarm		temp[1-*]_alarm
	Channel alarm		Channel alarm
	@@ -482,6 +499,8 @@ OR

	in[0-*]_min_alarm		in[0-*]_min_alarm
	in[0-*]_max_alarm		in[0-*]_max_alarm
			curr[1-*]_min_alarm
			curr[1-*]_max_alarm
	fan[1-*]_min_alarm		fan[1-*]_min_alarm
	fan[1-*]_max_alarm		fan[1-*]_max_alarm
	temp[1-*]_min_alarm		temp[1-*]_min_alarm
	@@ -497,7 +516,6 @@ to notify open diodes, unconnected fans etc. where the hardware
	supports it. When this boolean has value 1, the measurement for that		supports it. When this boolean has value 1, the measurement for that
	channel should not be trusted.		channel should not be trusted.

	in[0-*]_fault
	fan[1-*]_fault		fan[1-*]_fault
	temp[1-*]_fault		temp[1-*]_fault
	Input fault condition		Input fault condition
	@@ -513,6 +531,7 @@ beep_enable Master beep enable
	RW		RW

	in[0-*]_beep		in[0-*]_beep
			curr[1-*]_beep
	fan[1-*]_beep		fan[1-*]_beep
	temp[1-*]_beep		temp[1-*]_beep
	Channel beep		Channel beep

Documentation/hwmon/w83627ehf

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,10 @@ Supported chips:
	Prefix: 'w83667hg'		Prefix: 'w83667hg'
	Addresses scanned: ISA address retrieved from Super I/O registers		Addresses scanned: ISA address retrieved from Super I/O registers
	Datasheet: not available		Datasheet: not available
			* Winbond W83667HG-B
			Prefix: 'w83667hg'
			Addresses scanned: ISA address retrieved from Super I/O registers
			Datasheet: Available from Nuvoton upon request

	Authors:		Authors:
	Jean Delvare <khali@linux-fr.org>		Jean Delvare <khali@linux-fr.org>
	@@ -32,8 +36,8 @@ Description
	-----------		-----------

	This driver implements support for the Winbond W83627EHF, W83627EHG,		This driver implements support for the Winbond W83627EHF, W83627EHG,
	W83627DHG, W83627DHG-P and W83667HG super I/O chips. We will refer to them		W83627DHG, W83627DHG-P, W83667HG and W83667HG-B super I/O chips.
	collectively as Winbond chips.		We will refer to them collectively as Winbond chips.

	The chips implement three temperature sensors, five fan rotation		The chips implement three temperature sensors, five fan rotation
	speed sensors, ten analog voltage sensors (only nine for the 627DHG), one		speed sensors, ten analog voltage sensors (only nine for the 627DHG), one
	@@ -68,14 +72,15 @@ follows:
	temp1 -> pwm1		temp1 -> pwm1
	temp2 -> pwm2		temp2 -> pwm2
	temp3 -> pwm3		temp3 -> pwm3
	prog -> pwm4 (not on 667HG; the programmable setting is not supported by		prog -> pwm4 (not on 667HG and 667HG-B; the programmable setting is not
	the driver)		supported by the driver)

	/sys files		/sys files
	----------		----------

	name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG,		name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG,
	it is set to "w83627ehf" and for the W83627DHG it is set to "w83627dhg"		it is set to "w83627ehf", for the W83627DHG it is set to "w83627dhg",
			and for the W83667HG it is set to "w83667hg".

	pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:		pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:
	0 (stop) to 255 (full)		0 (stop) to 255 (full)

Admin message