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

Commit 84f768c1 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Jean Delvare
Browse files

hwmon: (thmc50) Add support for critical temperature limits 



Add critical temperature limits to the driver. These limits are read
only.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 68f823de

drivers/hwmon/thmc50.c

+27 −1
Original line number Diff line number Diff line
@@ -55,8 +55,11 @@ I2C_CLIENT_MODULE_PARM(adm1022_temp3, "List of adapter,address pairs " 
static const u8 THMC50_REG_TEMP[] = { 0x27, 0x26, 0x20 };

static const u8 THMC50_REG_TEMP_MIN[] = { 0x3A, 0x38, 0x2C };

static const u8 THMC50_REG_TEMP_MAX[] = { 0x39, 0x37, 0x2B };

static const u8 THMC50_REG_TEMP_CRITICAL[] = { 0x13, 0x14, 0x14 };

static const u8 THMC50_REG_TEMP_DEFAULT[] = { 0x17, 0x18, 0x18 };



#define THMC50_REG_CONF_nFANOFF			0x20

#define THMC50_REG_CONF_PROGRAMMED		0x08



/* Each client has this additional data */

struct thmc50_data {
@@ -72,6 +75,7 @@ struct thmc50_data { 
	s8 temp_input[3];

	s8 temp_max[3];

	s8 temp_min[3];

	s8 temp_critical[3];

	u8 analog_out;

	u8 alarms;

};
@@ -199,6 +203,15 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, 
	return count;

}



static ssize_t show_temp_critical(struct device *dev,

				  struct device_attribute *attr,

				  char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;

	struct thmc50_data *data = thmc50_update_device(dev);

	return sprintf(buf, "%d\n", data->temp_critical[nr] * 1000);

}



static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,

			  char *buf)

{
@@ -214,7 +227,9 @@ static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp, \ 
static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,	\

			show_temp_min, set_temp_min, offset - 1);	\

static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\

			show_temp_max, set_temp_max, offset - 1);

			show_temp_max, set_temp_max, offset - 1);	\

static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO,			\

			show_temp_critical, NULL, offset - 1);



temp_reg(1);

temp_reg(2);
@@ -234,10 +249,12 @@ static struct attribute *thmc50_attributes[] = { 
	&sensor_dev_attr_temp1_max.dev_attr.attr,

	&sensor_dev_attr_temp1_min.dev_attr.attr,

	&sensor_dev_attr_temp1_input.dev_attr.attr,

	&sensor_dev_attr_temp1_crit.dev_attr.attr,

	&sensor_dev_attr_temp1_alarm.dev_attr.attr,

	&sensor_dev_attr_temp2_max.dev_attr.attr,

	&sensor_dev_attr_temp2_min.dev_attr.attr,

	&sensor_dev_attr_temp2_input.dev_attr.attr,

	&sensor_dev_attr_temp2_crit.dev_attr.attr,

	&sensor_dev_attr_temp2_alarm.dev_attr.attr,

	&sensor_dev_attr_temp2_fault.dev_attr.attr,

	&sensor_dev_attr_pwm1.dev_attr.attr,
@@ -254,6 +271,7 @@ static struct attribute *temp3_attributes[] = { 
	&sensor_dev_attr_temp3_max.dev_attr.attr,

	&sensor_dev_attr_temp3_min.dev_attr.attr,

	&sensor_dev_attr_temp3_input.dev_attr.attr,

	&sensor_dev_attr_temp3_crit.dev_attr.attr,

	&sensor_dev_attr_temp3_alarm.dev_attr.attr,

	&sensor_dev_attr_temp3_fault.dev_attr.attr,

	NULL
@@ -429,6 +447,10 @@ static struct thmc50_data *thmc50_update_device(struct device *dev) 


		int temps = data->has_temp3 ? 3 : 2;

		int i;

		int prog = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);



		prog &= THMC50_REG_CONF_PROGRAMMED;



		for (i = 0; i < temps; i++) {

			data->temp_input[i] = i2c_smbus_read_byte_data(client,

						THMC50_REG_TEMP[i]);
@@ -436,6 +458,10 @@ static struct thmc50_data *thmc50_update_device(struct device *dev) 
						THMC50_REG_TEMP_MAX[i]);

			data->temp_min[i] = i2c_smbus_read_byte_data(client,

						THMC50_REG_TEMP_MIN[i]);

			data->temp_critical[i] =

				i2c_smbus_read_byte_data(client,

					prog ? THMC50_REG_TEMP_CRITICAL[i]

					     : THMC50_REG_TEMP_DEFAULT[i]);

		}

		data->analog_out =

		    i2c_smbus_read_byte_data(client, THMC50_REG_ANALOG_OUT);