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

Commit b1cd2ee3 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:
  hwmon: (abituguru3) enable DMI probing feature on AW9D-MAX
  hwmon: (abituguru3) Cosmetic whitespace fixes
  hwmon: (adt7473) Fix voltage conversion routines
  hwmon: (lm90) Add support for the LM99 16 degree offset
  hwmon: (lm90) Fix handling of hysteresis value
  hwmon-vid: Add support for AMD family 10h CPUs
  hwmon: (w83781d) Fix linking when built-in
parents e383d564 c02d6569

Documentation/hwmon/lm90

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Supported chips: 
    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/pf/LM/LM90.html

  * National Semiconductor LM89

    Prefix: 'lm99'

    Prefix: 'lm89' (no auto-detection)

    Addresses scanned: I2C 0x4c and 0x4d

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/mpf/LM/LM89.html

drivers/hwmon/abituguru3.c

+15 −15
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = { 
		{ "AUX3 Fan",		36, 2, 60, 1, 0 },

		{ NULL, 0, 0, 0, 0, 0 } }

	},

	{ 0x0016, NULL /* AW9D-MAX, need DMI string */, {

	{ 0x0016, "AW9D-MAX       (Intel i975-ICH7)", {

		{ "CPU Core",		 0, 0, 10, 1, 0 },

		{ "DDR2",		 1, 0, 20, 1, 0 },

		{ "DDR2 VTT",		 2, 0, 10, 1, 0 },

drivers/hwmon/adt7473.c

+9 −20
Original line number Diff line number Diff line
@@ -319,35 +319,24 @@ static struct adt7473_data *adt7473_update_device(struct device *dev) 
}



/*

 * On this chip, voltages are given as a count of steps between a minimum

 * and maximum voltage, not a direct voltage.

 * Conversions

 */

static const int volt_convert_table[][2] = {

	{2997, 3},

	{4395, 4},



/* IN are scaled acording to built-in resistors */

static const int adt7473_scaling[] = {  /* .001 Volts */

	2250, 3300

};

#define SCALE(val, from, to)	(((val) * (to) + ((from) / 2)) / (from))



static int decode_volt(int volt_index, u8 raw)

{

	int cmax = volt_convert_table[volt_index][0];

	int cmin = volt_convert_table[volt_index][1];

	return ((raw * (cmax - cmin)) / 255) + cmin;

	return SCALE(raw, 192, adt7473_scaling[volt_index]);

}



static u8 encode_volt(int volt_index, int cooked)

{

	int cmax = volt_convert_table[volt_index][0];

	int cmin = volt_convert_table[volt_index][1];

	u8 x;



	if (cooked > cmax)

		cooked = cmax;

	else if (cooked < cmin)

		cooked = cmin;



	x = ((cooked - cmin) * 255) / (cmax - cmin);



	return x;

	int raw = SCALE(cooked, adt7473_scaling[volt_index], 192);

	return SENSORS_LIMIT(raw, 0, 255);

}



static ssize_t show_volt_min(struct device *dev,

drivers/hwmon/hwmon-vid.c

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ static struct vrm_model vrm_models[] = { 
	{X86_VENDOR_AMD, 0x6, ANY, ANY, 90},		/* Athlon Duron etc */

	{X86_VENDOR_AMD, 0xF, 0x3F, ANY, 24},		/* Athlon 64, Opteron */

	{X86_VENDOR_AMD, 0xF, ANY, ANY, 25},		/* NPT family 0Fh */

	{X86_VENDOR_AMD, 0x10, ANY, ANY, 25},		/* NPT family 10h */

	{X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13},		/* Pentium M (130 nm) */

	{X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85},		/* Tualatin */

	{X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13},		/* Pentium M (90 nm) */

drivers/hwmon/lm90.c

+45 −7
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
 * made by National Semiconductor. Both have an increased remote

 * temperature measurement accuracy (1 degree), and the LM99

 * additionally shifts remote temperatures (measured and limits) by 16

 * degrees, which allows for higher temperatures measurement. The

 * driver doesn't handle it since it can be done easily in user-space.

 * degrees, which allows for higher temperatures measurement.

 * Note that there is no way to differentiate between both chips.

 * When device is auto-detected, the driver will assume an LM99.

 *

 * This driver also supports the LM86, another sensor chip made by

 * National Semiconductor. It is exactly similar to the LM90 except it
@@ -169,8 +169,8 @@ static const struct i2c_device_id lm90_id[] = { 
	{ "adt7461", adt7461 },

	{ "lm90", lm90 },

	{ "lm86", lm86 },

	{ "lm89", lm99 },

	{ "lm99", lm99 },	/* Missing temperature offset */

	{ "lm89", lm86 },

	{ "lm99", lm99 },

	{ "max6646", max6646 },

	{ "max6647", max6646 },

	{ "max6649", max6646 },
@@ -366,6 +366,10 @@ static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr, 
	else

		temp = temp_from_s8(data->temp8[attr->index]);



	/* +16 degrees offset for temp2 for the LM99 */

	if (data->kind == lm99 && attr->index == 3)

		temp += 16000;



	return sprintf(buf, "%d\n", temp);

}
@@ -385,6 +389,10 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr, 
	long val = simple_strtol(buf, NULL, 10);

	int nr = attr->index;



	/* +16 degrees offset for temp2 for the LM99 */

	if (data->kind == lm99 && attr->index == 3)

		val -= 16000;



	mutex_lock(&data->update_lock);

	if (data->kind == adt7461)

		data->temp8[nr] = temp_to_u8_adt7461(data, val);
@@ -411,6 +419,10 @@ static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr, 
	else

		temp = temp_from_s16(data->temp11[attr->index]);



	/* +16 degrees offset for temp2 for the LM99 */

	if (data->kind == lm99 &&  attr->index <= 2)

		temp += 16000;



	return sprintf(buf, "%d\n", temp);

}
@@ -432,6 +444,10 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr, 
	long val = simple_strtol(buf, NULL, 10);

	int nr = attr->index;



	/* +16 degrees offset for temp2 for the LM99 */

	if (data->kind == lm99 && attr->index <= 2)

		val -= 16000;



	mutex_lock(&data->update_lock);

	if (data->kind == adt7461)

		data->temp11[nr] = temp_to_u16_adt7461(data, val);
@@ -461,9 +477,15 @@ static ssize_t show_temphyst(struct device *dev, struct device_attribute *devatt 


	if (data->kind == adt7461)

		temp = temp_from_u8_adt7461(data, data->temp8[attr->index]);

	else if (data->kind == max6646)

		temp = temp_from_u8(data->temp8[attr->index]);

	else

		temp = temp_from_s8(data->temp8[attr->index]);



	/* +16 degrees offset for temp2 for the LM99 */

	if (data->kind == lm99 && attr->index == 3)

		temp += 16000;



	return sprintf(buf, "%d\n", temp - temp_from_s8(data->temp_hyst));

}
@@ -473,12 +495,19 @@ static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy, 
	struct i2c_client *client = to_i2c_client(dev);

	struct lm90_data *data = i2c_get_clientdata(client);

	long val = simple_strtol(buf, NULL, 10);

	long hyst;

	int temp;



	mutex_lock(&data->update_lock);

	hyst = temp_from_s8(data->temp8[2]) - val;

	if (data->kind == adt7461)

		temp = temp_from_u8_adt7461(data, data->temp8[2]);

	else if (data->kind == max6646)

		temp = temp_from_u8(data->temp8[2]);

	else

		temp = temp_from_s8(data->temp8[2]);



	data->temp_hyst = hyst_to_reg(temp - val);

	i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST,

				  hyst_to_reg(hyst));

				  data->temp_hyst);

	mutex_unlock(&data->update_lock);

	return count;

}
@@ -682,6 +711,15 @@ static int lm90_detect(struct i2c_client *new_client, int kind, 
				} else

				if ((chip_id & 0xF0) == 0x30) { /* LM89/LM99 */

					kind = lm99;

					dev_info(&adapter->dev,

						 "Assuming LM99 chip at "

						 "0x%02x\n", address);

					dev_info(&adapter->dev,

						 "If it is an LM89, pass "

						 "force_lm86=%d,0x%02x when "

						 "loading the lm90 driver\n",

						 i2c_adapter_id(adapter),

						 address);

				} else

				if (address == 0x4C

				 && (chip_id & 0xF0) == 0x10) { /* LM86 */