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

readings. Be sure to have a high vs. low temperature limit gap of al least

1.0 degree Celsius to avoid Tout "bouncing", though!

As for alarms, you can read the alarm status of the DS1621 via the 'alarms'

/sys file interface. The result consists mainly of bit 6 and 5 of the

configuration register of the chip; bit 6 (0x40 or 64) is the high alarm

bit and bit 5 (0x20 or 32) the low one. These bits are set when the high or

low limits are met or exceeded and are reset by the module as soon as the

respective temperature ranges are left.

The alarm bits are set when the high or low limits are met or exceeded and

are reset by the module as soon as the respective temperature ranges are

left.

The alarm registers are in no way suitable to find out about the actual

status of Tout. They will only tell you about its history, whether or not

Temperature conversion of the DS1621 takes up to 1000ms; internal access to

non-volatile registers may last for 10ms or below.

High Accuracy Temperature Reading

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

As said before, the temperature issued via the 9-bit i2c-bus data is

somewhat arbitrary. Internally, the temperature conversion is of a

different kind that is explained (not so...) well in the DS1621 data sheet.

To cut the long story short: Inside the DS1621 there are two oscillators,

both of them biassed by a temperature coefficient.

Higher resolution of the temperature reading can be achieved using the

internal projection, which means taking account of REG_COUNT and REG_SLOPE

(the driver manages them):

Taken from Dallas Semiconductors App Note 068: 'Increasing Temperature

Resolution on the DS1620' and App Note 105: 'High Resolution Temperature

Measurement with Dallas Direct-to-Digital Temperature Sensors'

- Read the 9-bit temperature and strip the LSB (Truncate the .5 degs)

- The resulting value is TEMP_READ.

- Then, read REG_COUNT.

- And then, REG_SLOPE.

      TEMP = TEMP_READ - 0.25 + ((REG_SLOPE - REG_COUNT) / REG_SLOPE)

Note that this is what the DONE bit in the DS1621 configuration register is

good for: Internally, one temperature conversion takes up to 1000ms. Before

that conversion is complete you will not be able to read valid things out

of REG_COUNT and REG_SLOPE. The DONE bit, as you may have guessed by now,

tells you whether the conversion is complete ("done", in plain English) and

thus, whether the values you read are good or not.

The DS1621 has two modes of operation: "Continuous" conversion, which can

be understood as the default stand-alone mode where the chip gets the

temperature and controls external devices via its Tout pin or tells other

i2c's about it if they care. The other mode is called "1SHOT", that means

that it only figures out about the temperature when it is explicitly told

to do so; this can be seen as power saving mode.

Now if you want to read REG_COUNT and REG_SLOPE, you have to either stop

the continuous conversions until the contents of these registers are valid,

or, in 1SHOT mode, you have to have one conversion made.

				Unit: microJoule

				RO

**********

* Alarms *

**********

		RW

***********************

* Intrusion detection *

***********************

intrusion[0-*]_alarm

		Chassis intrusion detection

		0: OK

		1: intrusion detected

		RW

		Contrary to regular alarm flags which clear themselves

		automatically when read, this one sticks until cleared by

		the user. This is done by writing 0 to the file. Writing

		other values is unsupported.

intrusion[0-*]_beep

		Chassis intrusion beep

		0: disable

		1: enable

		RW

sysfs attribute writes interpretation

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

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

Supported chips:

  * Winbond W83627EHF/EHG/DHG (ISA access ONLY)

  * Winbond W83627EHF/EHG (ISA access ONLY)

    Prefix: 'w83627ehf'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet:

        http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83627EHF_%20W83627EHGb.pdf

        DHG datasheet confidential.

        http://www.nuvoton.com.tw/NR/rdonlyres/A6A258F0-F0C9-4F97-81C0-C4D29E7E943E/0/W83627EHF.pdf

  * Winbond W83627DHG

    Prefix: 'w83627dhg'

    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 W83667HG

    Prefix: 'w83667hg'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: not available

Authors:

        Jean Delvare <khali@linux-fr.org>

        Yuan Mu (Winbond)

        Rudolf Marek <r.marek@assembler.cz>

        David Hubbard <david.c.hubbard@gmail.com>

        Gong Jun <JGong@nuvoton.com>

Description

-----------

This driver implements support for the Winbond W83627EHF, W83627EHG, and

W83627DHG super I/O chips. We will refer to them collectively as Winbond chips.

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.

The chips implement three temperature sensors, five fan rotation

speed sensors, ten analog voltage sensors (only nine for the 627DHG), one

VID (6 pins for the 627EHF/EHG, 8 pins for the 627DHG), alarms with beep

warnings (control unimplemented), and some automatic fan regulation

strategies (plus manual fan control mode).

VID (6 pins for the 627EHF/EHG, 8 pins for the 627DHG and 667HG), alarms

with beep warnings (control unimplemented), and some automatic fan

regulation strategies (plus manual fan control mode).

Temperatures are measured in degrees Celsius and measurement resolution is 1

degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when

temp1 -> pwm1

temp2 -> pwm2

temp3 -> pwm3

prog  -> pwm4 (the programmable setting is not supported by the driver)

prog  -> pwm4 (not on 667HG; the programmable setting is not supported by

	       the driver)

/sys files

----------

 *	pointing to completely the wrong place for example

 */

static void dmi_table(u8 *buf, int len, int num,

		      void (*decode)(const struct dmi_header *))

		      void (*decode)(const struct dmi_header *, void *),

		      void *private_data)

{

	u8 *data = buf;

	int i = 0;

		while ((data - buf < len - 1) && (data[0] || data[1]))

			data++;

		if (data - buf < len - 1)

			decode(dm);

			decode(dm, private_data);

		data += 2;

		i++;

	}

static u16 dmi_len;

static u16 dmi_num;

static int __init dmi_walk_early(void (*decode)(const struct dmi_header *))

static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,

		void *))

{

	u8 *buf;

	if (buf == NULL)

		return -1;

	dmi_table(buf, dmi_len, dmi_num, decode);

	dmi_table(buf, dmi_len, dmi_num, decode, NULL);

	dmi_iounmap(buf, dmi_len);

	return 0;

 *	and machine entries. For 2.5 we should pull the smbus controller info

 *	out of here.

 */

static void __init dmi_decode(const struct dmi_header *dm)

static void __init dmi_decode(const struct dmi_header *dm, void *dummy)

{

	switch(dm->type) {

	case 0:		/* BIOS Information */

/**

 *	dmi_walk - Walk the DMI table and get called back for every record

 *	@decode: Callback function

 *	@private_data: Private data to be passed to the callback function

 *

 *	Returns -1 when the DMI table can't be reached, 0 on success.

 */

int dmi_walk(void (*decode)(const struct dmi_header *))

int dmi_walk(void (*decode)(const struct dmi_header *, void *),

	     void *private_data)

{

	u8 *buf;

	if (buf == NULL)

		return -1;

	dmi_table(buf, dmi_len, dmi_num, decode);

	dmi_table(buf, dmi_len, dmi_num, decode, private_data);

	iounmap(buf);

	return 0;