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

Commit 2f2408a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (29 commits)
  hwmon: Fix various typos
  hwmon: Check for ACPI resource conflicts
  hwmon: (lm70) Add TI TMP121 support
  hwmon: (lm70) Code streamlining and cleanup
  hwmon: Deprecate the fscher and fscpos drivers
  hwmon: (fschmd) Add watchdog support
  hwmon: (fschmd) Cleanups for watchdog support
  hwmon: (i5k_amb) Load automatically on all 5000/5400 chipsets
  hwmon: (it87) Add support for the ITE IT8720F
  hwmon: Don't overuse I2C_CLIENT_MODULE_PARM
  hwmon: Add LTC4245 driver
  hwmon: (f71882fg) Fix fan_to/from_reg prototypes
  hwmon: (f71882fg) Printout fan modes
  hwmon: (f71882fg) Add documentation
  hwmon: (f71882fg) Fix auto_channels_temp temp numbering with f8000
  hwmon: (f71882fg) Add missing pwm3 attr for f71862fg
  hwmon: (f71882fg) Add F8000 support
  hwmon: (f71882fg) Remove the fan_mode module option
  hwmon: (f71882fg) Separate max and crit alarm and beep
  hwmon: (f71882fg) Check for hwmon powerdown state
  ...
parents fa7b906e 77fa49d9

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -318,6 +318,14 @@ Who: Jean Delvare <khali@linux-fr.org> 


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



What:	fscher and fscpos drivers

When:	June 2009

Why:	Deprecated by the new fschmd driver.

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

	Jean Delvare <khali@linux-fr.org>



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



What:	SELinux "compat_net" functionality

When:	2.6.30 at the earliest

Why:	In 2.6.18 the Secmark concept was introduced to replace the "compat_net"

Documentation/hwmon/f71882fg

0 → 100644
+89 −0
Original line number Diff line number Diff line 
Kernel driver f71882fg

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



Supported chips:

  * Fintek F71882FG and F71883FG

    Prefix: 'f71882fg'

    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 F8000

    Prefix: 'f8000'

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

    Datasheet: Not public



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





Description

-----------



Fintek F718xxFG/F8000 Super I/O chips include complete hardware monitoring

capabilities. They can monitor up to 9 voltages (3 for the F8000), 4 fans and

3 temperature sensors.



These chips also have fan controlling features, using either DC or PWM, in

three different modes (one manual, two automatic).



The driver assumes that no more than one chip is present, which seems

reasonable.





Monitoring

----------



The Voltage, Fan and Temperature Monitoring uses the standard sysfs

interface as documented in sysfs-interface, without any exceptions.





Fan Control

-----------



Both PWM (pulse-width modulation) and DC fan speed control methods are

supported. The right one to use depends on external circuitry on the

motherboard, so the driver assumes that the BIOS set the method

properly.



There are 2 modes to specify the speed of the fan, PWM duty cycle (or DC

voltage) mode, where 0-100% duty cycle (0-100% of 12V) is specified. And RPM

mode where the actual RPM of the fan (as measured) is controlled and the speed

gets specified as 0-100% of the fan#_full_speed file.



Since both modes work in a 0-100% (mapped to 0-255) scale, there isn't a

whole lot of a difference when modifying fan control settings. The only

important difference is that in RPM mode the 0-100% controls the fan speed

between 0-100% of fan#_full_speed. It is assumed that if the BIOS programs

RPM mode, it will also set fan#_full_speed properly, if it does not then

fan control will not work properly, unless you set a sane fan#_full_speed

value yourself.



Switching between these modes requires re-initializing a whole bunch of

registers, so the mode which the BIOS has set is kept. The mode is

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.

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.



* 2: Normal auto mode

  You can define a number of temperature/fan speed trip points, which % the

  fan should run at at this temp and which temp a fan should follow using the

  standard sysfs interface. The number and type of trip points is chip

  depended, see which files are available in sysfs.

  Fan/PWM channel 3 of the F8000 is always in this mode!



* 3: Thermostat mode (Only available on the F8000 when in duty cycle mode)

  The fan speed is regulated to keep the temp the fan is mapped to between

  temp#_auto_point2_temp and temp#_auto_point3_temp.



Both of the automatic modes require that pwm1 corresponds to fan1, pwm2 to

fan2 and pwm3 to fan3.

Documentation/hwmon/it87

+12 −8
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ Supported chips: 
    Datasheet: Publicly available at the ITE website

               http://www.ite.com.tw/product_info/file/pc/IT8718F_V0.2.zip

               http://www.ite.com.tw/product_info/file/pc/IT8718F_V0%203_(for%20C%20version).zip

  * IT8720F

    Prefix: 'it8720'

    Addresses scanned: from Super I/O config space (8 I/O ports)

    Datasheet: Not yet publicly available.

  * SiS950   [clone of IT8705F]

    Prefix: 'it87'

    Addresses scanned: from Super I/O config space (8 I/O ports)
@@ -71,7 +75,7 @@ Description 
-----------



This driver implements support for the IT8705F, IT8712F, IT8716F,

IT8718F, IT8726F and SiS950 chips.

IT8718F, IT8720F, IT8726F and SiS950 chips.



These chips are 'Super I/O chips', supporting floppy disks, infrared ports,

joysticks and other miscellaneous stuff. For hardware monitoring, they
@@ -84,19 +88,19 @@ the IT8716F and late IT8712F have 6. They are shared with other functions 
though, so the functionality may not be available on a given system.

The driver dumbly assume it is there.



The IT8718F also features VID inputs (up to 8 pins) but the value is

stored in the Super-I/O configuration space. Due to technical limitations,

The IT8718F and IT8720F also features VID inputs (up to 8 pins) but the value

is stored in the Super-I/O configuration space. Due to technical limitations,

this value can currently only be read once at initialization time, so

the driver won't notice and report changes in the VID value. The two

upper VID bits share their pins with voltage inputs (in5 and in6) so you

can't have both on a given board.



The IT8716F, IT8718F and later IT8712F revisions have support for

The IT8716F, IT8718F, IT8720F and later IT8712F revisions have support for

2 additional fans. The additional fans are supported by the driver.



The IT8716F and IT8718F, and late IT8712F and IT8705F also have optional

16-bit tachometer counters for fans 1 to 3. This is better (no more fan

clock divider mess) but not compatible with the older chips and

The IT8716F, IT8718F and IT8720F, and late IT8712F and IT8705F also have

optional 16-bit tachometer counters for fans 1 to 3. This is better (no more

fan clock divider mess) but not compatible with the older chips and

revisions. The 16-bit tachometer mode is enabled by the driver when one

of the above chips is detected.
@@ -122,7 +126,7 @@ zero'; this is important for negative voltage measurements. All voltage 
inputs can measure voltages between 0 and 4.08 volts, with a resolution of

0.016 volt. The battery voltage in8 does not have limit registers.



The VID lines (IT8712F/IT8716F/IT8718F) encode the core voltage value:

The VID lines (IT8712F/IT8716F/IT8718F/IT8720F) encode the core voltage value:

the voltage level your processor should work with. This is hardcoded by

the mainboard and/or processor itself. It is a value in volts.

Documentation/hwmon/lm70

+11 −1
Original line number Diff line number Diff line 
Kernel driver lm70

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



Supported chip:

Supported chips:

  * National Semiconductor LM70

    Datasheet: http://www.national.com/pf/LM/LM70.html

  * Texas Instruments TMP121/TMP123

    Information: http://focus.ti.com/docs/prod/folders/print/tmp121.html



Author:

        Kaiwan N Billimoria <kaiwan@designergraphix.com>
@@ -25,6 +27,14 @@ complement digital temperature (sent via the SIO line), is available in the 
driver for interpretation. This driver makes use of the kernel's in-core

SPI support.



As a real (in-tree) example of this "SPI protocol driver" interfacing

with a "SPI master controller driver", see drivers/spi/spi_lm70llp.c

and its associated documentation.



The TMP121/TMP123 are very similar; main differences are 4 wire SPI inter-

face (read only) and 13-bit temperature data (0.0625 degrees celsius reso-

lution).



Thanks to

---------

Jean Delvare <khali@linux-fr.org> for mentoring the hwmon-side driver

Documentation/hwmon/lm85

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ configured individually according to the following options. 
                      temperature. (PWM value from 0 to 255)



* pwm#_auto_pwm_minctl - this flags selects for temp#_auto_temp_off temperature

                         the bahaviour of fans. Write 1 to let fans spinning at

                         the behaviour of fans. Write 1 to let fans spinning at

			 pwm#_auto_pwm_min or write 0 to let them off.



NOTE: It has been reported that there is a bug in the LM85 that causes the flag