Commit 67605613 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
  hwmon: needs new maintainer
  hwmon: (lm85) Simplify device initialization function
  hwmon: (lm85) Misc cleanups
  hwmon: (lm85) Don't write back cached values
  hwmon: (lm85) Drop dead code
  hwmon: (lm85) Coding-style cleanups
  hwmon: (lm75) add new-style driver binding
  hwmon: (lm75) cleanup/reorg
  hwmon: (adt7473) clarify an awkward bit of code
  hwmon: (adt7473) Remove unused defines
  hwmon: (dme1737) fix voltage scaling
  hwmon: (dme1737) probe all addresses
  hwmon: (dme1737) demacrofy for readability
parents 623fa579 47d715af

Documentation/hwmon/dme1737

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ Module Parameters 
			and PWM output control functions. Using this parameter

			shouldn't be required since the BIOS usually takes care

			of this.

* probe_all_addr: bool	Include non-standard LPC addresses 0x162e and 0x164e

			when probing for ISA devices. This is required for the

			following boards:

			- VIA EPIA SN18000



Note that there is no need to use this parameter if the driver loads without

complaining. The driver will say so if it is necessary.

Documentation/hwmon/lm85

+4 −7
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ initial testing of the ADM1027 it was 1.00 degC steps. Analog Devices has 
confirmed this "bug". The ADT7463 is reported to work as described in the

documentation. The current lm85 driver does not show the offset register.



The ADT7463 has a THERM asserted counter. This counter has a 22.76ms

resolution and a range of 5.8 seconds. The driver implements a 32-bit

accumulator of the counter value to extend the range to over a year. The

counter will stay at it's max value until read.



See the vendor datasheets for more information. There is application note

from National (AN-1260) with some additional information about the LM85.

The Analog Devices datasheet is very detailed and describes a procedure for
@@ -206,13 +201,15 @@ Configuration choices: 


The National LM85's have two vendor specific configuration

features. Tach. mode and Spinup Control. For more details on these,

see the LM85 datasheet or Application Note AN-1260.

see the LM85 datasheet or Application Note AN-1260. These features

are not currently supported by the lm85 driver.



The Analog Devices ADM1027 has several vendor specific enhancements.

The number of pulses-per-rev of the fans can be set, Tach monitoring

can be optimized for PWM operation, and an offset can be applied to

the temperatures to compensate for systemic errors in the

measurements.

measurements. These features are not currently supported by the lm85

driver.



In addition to the ADM1027 features, the ADT7463 also has Tmin control

and THERM asserted counts. Automatic Tmin control acts to adjust the

MAINTAINERS

+1 −5
Original line number Diff line number Diff line
@@ -1878,13 +1878,9 @@ W: http://gigaset307x.sourceforge.net/ 
S:	Maintained



HARDWARE MONITORING

P:	Mark M. Hoffman

M:	mhoffman@lightlink.com

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

T:	git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git testing

T:	git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git release

S:	Maintained

S:	Orphaned



HARDWARE RANDOM NUMBER GENERATOR CORE

S:	Orphaned

drivers/hwmon/Kconfig

+18 −7
Original line number Diff line number Diff line
@@ -394,13 +394,24 @@ config SENSORS_LM75 
	tristate "National Semiconductor LM75 and compatibles"

	depends on I2C

	help

	  If you say yes here you get support for National Semiconductor LM75

	  sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in

	  9-bit precision mode), and TelCom (now Microchip) TCN75.



	  The DS75 and DS1775 in 10- to 12-bit precision modes will require

	  a force module parameter. The driver will not handle the extra

	  precision anyhow.

	  If you say yes here you get support for one common type of

	  temperature sensor chip, with models including:



		- Dallas Semiconductor DS75 and DS1775

		- Maxim MAX6625 and MAX6626

		- Microchip MCP980x

		- National Semiconductor LM75

		- NXP's LM75A

		- ST Microelectronics STDS75

		- TelCom (now Microchip) TCN75

		- Texas Instruments TMP100, TMP101, TMP75, TMP175, TMP275



	  This driver supports driver model based binding through board

	  specific I2C device tables.



	  It also supports the "legacy" style of driver binding.  To use

	  that with some chips which don't replicate LM75 quirks exactly,

	  you may need the "force" module parameter.



	  This driver can also be built as a module.  If so, the module

	  will be called lm75.

drivers/hwmon/adt7473.c

+1 −15
Original line number Diff line number Diff line
@@ -39,32 +39,20 @@ I2C_CLIENT_INSMOD_1(adt7473); 
#define ADT7473_REG_BASE_ADDR			0x20



#define ADT7473_REG_VOLT_BASE_ADDR		0x21

#define ADT7473_REG_VOLT_MAX_ADDR		0x22

#define ADT7473_REG_VOLT_MIN_BASE_ADDR		0x46

#define ADT7473_REG_VOLT_MIN_MAX_ADDR		0x49



#define ADT7473_REG_TEMP_BASE_ADDR		0x25

#define ADT7473_REG_TEMP_MAX_ADDR		0x27

#define ADT7473_REG_TEMP_LIMITS_BASE_ADDR	0x4E

#define ADT7473_REG_TEMP_LIMITS_MAX_ADDR	0x53

#define ADT7473_REG_TEMP_TMIN_BASE_ADDR		0x67

#define ADT7473_REG_TEMP_TMIN_MAX_ADDR		0x69

#define ADT7473_REG_TEMP_TMAX_BASE_ADDR		0x6A

#define ADT7473_REG_TEMP_TMAX_MAX_ADDR		0x6C



#define ADT7473_REG_FAN_BASE_ADDR		0x28

#define ADT7473_REG_FAN_MAX_ADDR		0x2F

#define ADT7473_REG_FAN_MIN_BASE_ADDR		0x54

#define ADT7473_REG_FAN_MIN_MAX_ADDR		0x5B



#define ADT7473_REG_PWM_BASE_ADDR		0x30

#define ADT7473_REG_PWM_MAX_ADDR		0x32

#define	ADT7473_REG_PWM_MIN_BASE_ADDR		0x64

#define ADT7473_REG_PWM_MIN_MAX_ADDR		0x66

#define ADT7473_REG_PWM_MAX_BASE_ADDR		0x38

#define ADT7473_REG_PWM_MAX_MAX_ADDR		0x3A

#define ADT7473_REG_PWM_BHVR_BASE_ADDR		0x5C

#define ADT7473_REG_PWM_BHVR_MAX_ADDR		0x5E

#define		ADT7473_PWM_BHVR_MASK		0xE0

#define		ADT7473_PWM_BHVR_SHIFT		5
@@ -102,7 +90,6 @@ I2C_CLIENT_INSMOD_1(adt7473); 
#define		ADT7473_FAN4_ALARM		0x20

#define		ADT7473_R1T_SHORT		0x40

#define		ADT7473_R2T_SHORT		0x80

#define ADT7473_REG_MAX_ADDR			0x80



#define ALARM2(x)	((x) << 8)
@@ -583,10 +570,9 @@ static ssize_t set_max_duty_at_crit(struct device *dev, 
	struct i2c_client *client = to_i2c_client(dev);

	struct adt7473_data *data = i2c_get_clientdata(client);

	int temp = simple_strtol(buf, NULL, 10);

	temp = temp && 0xFF;



	mutex_lock(&data->lock);

	data->max_duty_at_overheat = temp;

	data->max_duty_at_overheat = !!temp;

	reg = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG4);

	if (temp)

		reg |= ADT7473_CFG4_MAX_DUTY_AT_OVT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE