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

Kernel driver coretemp

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

Supported chips:

  * All Intel Core family

    Prefix: 'coretemp'

    CPUID: family 0x6, models 0xe, 0xf

    Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual

               Volume 3A: System Programming Guide

Author: Rudolf Marek

Description

-----------

This driver permits reading temperature sensor embedded inside Intel Core CPU.

Temperature is measured in degrees Celsius and measurement resolution is

1 degree C. Valid temperatures are from 0 to TjMax degrees C, because

the actual value of temperature register is in fact a delta from TjMax.

Temperature known as TjMax is the maximum junction temperature of processor.

Intel defines this temperature as 85C or 100C. At this temperature, protection

mechanism will perform actions to forcibly cool down the processor. Alarm

may be raised, if the temperature grows enough (more than TjMax) to trigger

the Out-Of-Spec bit. Following table summarizes the exported sysfs files:

temp1_input	 - Core temperature (in millidegrees Celsius).

temp1_crit	 - Maximum junction temperature  (in millidegrees Celsius).

temp1_crit_alarm - Set when Out-of-spec bit is set, never clears.

		   Correct CPU operation is no longer guaranteed.

temp1_label	 - Contains string "Core X", where X is processor

		   number.

The TjMax temperature is set to 85 degrees C if undocumented model specific

register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as

(sometimes) documented in processor datasheet.

Kernel driver max6650

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

Supported chips:

  * Maxim 6650 / 6651

    Prefix: 'max6650'

    Addresses scanned: I2C 0x1b, 0x1f, 0x48, 0x4b

    Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf

Authors:

    Hans J. Koch <hjk@linutronix.de>

    John Morris <john.morris@spirentcom.com>

    Claus Gindhart <claus.gindhart@kontron.com>

Description

-----------

This driver implements support for the Maxim 6650/6651

The 2 devices are very similar, but the Maxim 6550 has a reduced feature

set, e.g. only one fan-input, instead of 4 for the 6651.

The driver is not able to distinguish between the 2 devices.

The driver provides the following sensor accesses in sysfs:

fan1_input	ro	fan tachometer speed in RPM

fan2_input	ro	"

fan3_input	ro	"

fan4_input	ro	"

fan1_target	rw	desired fan speed in RPM (closed loop mode only)

pwm1_enable	rw	regulator mode, 0=full on, 1=open loop, 2=closed loop

pwm1		rw	relative speed (0-255), 255=max. speed.

			Used in open loop mode only.

fan1_div	rw	sets the speed range the inputs can handle. Legal

			values are 1, 2, 4, and 8. Use lower values for

			faster fans.

Module parameters

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

If your board has a BIOS that initializes the MAX6650/6651 correctly, you can

simply load your module without parameters. It won't touch the configuration

registers then. If your board BIOS doesn't initialize the chip, or you want

different settings, you can set the following parameters:

voltage_12V: 5=5V fan, 12=12V fan, 0=don't change

prescaler: Possible values are 1,2,4,8,16, or 0 for don't change

clock: The clock frequency in Hz of the chip the driver should assume [254000]

Please have a look at the MAX6650/6651 data sheet and make sure that you fully

understand the meaning of these parameters before you attempt to change them.

        http://www.smsc.com/main/datasheets/47m14x.pdf

        http://www.smsc.com/main/tools/discontinued/47m15x.pdf

        http://www.smsc.com/main/datasheets/47m192.pdf

  * SMSC LPC47M292

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

    Prefix: 'smsc47m2'

    Datasheet: Not public

  * SMSC LPC47M997

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

    Prefix: 'smsc47m1'

The Standard Microsystems Corporation (SMSC) 47M1xx Super I/O chips

contain monitoring and PWM control circuitry for two fans.

The 47M15x and 47M192 chips contain a full 'hardware monitoring block'

in addition to the fan monitoring and control. The hardware monitoring

block is not supported by the driver.

The LPC47M15x, LPC47M192 and LPC47M292 chips contain a full 'hardware

monitoring block' in addition to the fan monitoring and control. The

hardware monitoring block is not supported by this driver, use the

smsc47m192 driver for that.

No documentation is available for the 47M997, but it has the same device

ID as the 47M15x and 47M192 chips and seems to be compatible.

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

Supported chips:

  * SMSC LPC47M192 and LPC47M997

  * SMSC LPC47M192, LPC47M15x, LPC47M292 and LPC47M997

    Prefix: 'smsc47m192'

    Addresses scanned: I2C 0x2c - 0x2d

    Datasheet: The datasheet for LPC47M192 is publicly available from

               http://www.smsc.com/

               The LPC47M997 is compatible for hardware monitoring.

               The LPC47M15x, LPC47M292 and LPC47M997 are compatible for

               hardware monitoring.

Author: Hartmut Rick <linux@rick.claranet.de>

        Special thanks to Jean Delvare for careful checking

-----------

This driver implements support for the hardware sensor capabilities

of the SMSC LPC47M192 and LPC47M997 Super-I/O chips.

of the SMSC LPC47M192 and compatible Super-I/O chips.

These chips support 3 temperature channels and 8 voltage inputs

as well as CPU voltage VID input.

		Note that this is actually an internal clock divisor, which

		affects the measurable speed range, not the read value.

fan[1-*]_target

		Desired fan speed

		Unit: revolution/min (RPM)

		RW

		Only makes sense if the chip supports closed-loop fan speed

		control based on the measured fan speed.

Also see the Alarms section for status flags associated with fans.