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

Documentation/hwmon/f71882fg

+8 −4

Original line number	Diff line number	Diff line
		@@ -2,14 +2,18 @@ Kernel driver f71882fg
		======================

		Supported chips:
		* Fintek F71882FG and F71883FG
		Prefix: 'f71882fg'
		* Fintek F71858FG
		Prefix: 'f71858fg'
		Addresses scanned: none, address read from Super I/O config space
		Datasheet: Available from the Fintek website
		* Fintek F71862FG and F71863FG
		Prefix: 'f71862fg'
		Addresses scanned: none, address read from Super I/O config space
		Datasheet: Available from the Fintek website
		* Fintek F71882FG and F71883FG
		Prefix: 'f71882fg'
		Addresses scanned: none, address read from Super I/O config space
		Datasheet: Available from the Fintek website
		* Fintek F8000
		Prefix: 'f8000'
		Addresses scanned: none, address read from Super I/O config space
		@@ -66,13 +70,13 @@ printed when loading the driver.

		Three different fan control modes are supported; the mode number is written
		to the pwm#_enable file. Note that not all modes are supported on all
		chips, and some modes may only be available in RPM / PWM mode on the F8000.
		chips, and some modes may only be available in RPM / PWM mode.
		Writing an unsupported mode will result in an invalid parameter error.

		* 1: Manual mode
		You ask for a specific PWM duty cycle / DC voltage or a specific % of
		fan#_full_speed by writing to the pwm# file. This mode is only
		available on the F8000 if the fan channel is in RPM mode.
		available on the F71858FG / F8000 if the fan channel is in RPM mode.

		* 2: Normal auto mode
		You can define a number of temperature/fan speed trip points, which % the

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ henceforth as AEM.
		Supported systems:
		* Any recent IBM System X server with AEM support.
		This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
		x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface
		x3950 M2, and certain HC10/HS2x/LS2x/QS2x blades. The IPMI host interface
		driver ("ipmi-si") needs to be loaded for this driver to do anything.
		Prefix: 'ibmaem'
		Datasheet: Not available

+19 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ are interpreted as 0! For more on how written strings are interpreted see the
		[0-*] denotes any positive number starting from 0
		[1-*] denotes any positive number starting from 1
		RO read only value
		WO write only value
		RW read/write value

		Read/write values may be read-only for some chips, depending on the
		@@ -295,6 +296,24 @@ temp[1-*]_label Suggested temperature channel label.
		user-space.
		RO

		temp[1-*]_lowest
		Historical minimum temperature
		Unit: millidegree Celsius
		RO

		temp[1-*]_highest
		Historical maximum temperature
		Unit: millidegree Celsius
		RO

		temp[1-*]_reset_history
		Reset temp_lowest and temp_highest
		WO

		temp_reset_history
		Reset temp_lowest and temp_highest for all sensors
		WO

		Some chips measure temperature using external thermistors and an ADC, and
		report the temperature measurement as a voltage. Converting this voltage
		back to a temperature (or the other way around for limits) requires

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		Kernel driver tmp401
		====================

		Supported chips:
		* Texas Instruments TMP401
		Prefix: 'tmp401'
		Addresses scanned: I2C 0x4c
		Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp401.html
		* Texas Instruments TMP411
		Prefix: 'tmp411'
		Addresses scanned: I2C 0x4c
		Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp411.html

		Authors:
		Hans de Goede <hdegoede@redhat.com>
		Andre Prendel <andre.prendel@gmx.de>

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

		This driver implements support for Texas Instruments TMP401 and
		TMP411 chips. These chips implements one remote and one local
		temperature sensor. Temperature is measured in degrees
		Celsius. Resolution of the remote sensor is 0.0625 degree. Local
		sensor resolution can be set to 0.5, 0.25, 0.125 or 0.0625 degree (not
		supported by the driver so far, so using the default resolution of 0.5
		degree).

		The driver provides the common sysfs-interface for temperatures (see
		/Documentation/hwmon/sysfs-interface under Temperatures).

		The TMP411 chip is compatible with TMP401. It provides some additional
		features.

		* Minimum and Maximum temperature measured since power-on, chip-reset

		Exported via sysfs attributes tempX_lowest and tempX_highest.

		* Reset of historical minimum/maximum temperature measurements

		Exported via sysfs attribute temp_reset_history. Writing 1 to this
		file triggers a reset.

+9 −2

Original line number	Diff line number	Diff line
		@@ -12,6 +12,10 @@ Supported chips:
		Addresses scanned: ISA address retrieved from Super I/O registers
		Datasheet:
		http://www.nuvoton.com.tw/NR/rdonlyres/7885623D-A487-4CF9-A47F-30C5F73D6FE6/0/W83627DHG.pdf
		* Winbond W83627DHG-P
		Prefix: 'w83627dhg'
		Addresses scanned: ISA address retrieved from Super I/O registers
		Datasheet: not available
		* Winbond W83667HG
		Prefix: 'w83667hg'
		Addresses scanned: ISA address retrieved from Super I/O registers
		@@ -28,8 +32,8 @@ Description
		-----------

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

		The chips implement three temperature sensors, five fan rotation
		speed sensors, ten analog voltage sensors (only nine for the 627DHG), one
		@@ -135,3 +139,6 @@ done in the driver for all register addresses.
		The DHG also supports PECI, where the DHG queries Intel CPU temperatures, and
		the ICH8 southbridge gets that data via PECI from the DHG, so that the
		southbridge drives the fans. And the DHG supports SST, a one-wire serial bus.

		The DHG-P has an additional automatic fan speed control mode named Smart Fan
		(TM) III+. This mode is not yet supported by the driver.