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

Commit 9060f8bd authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

it87: No sysfs files for disabled fans 



it87: No sysfs files for disabled fans

Only create the fan attributes for enabled fan tachometers. Some
motherboards have a nice BIOS which only enables the fan inputs which
are wired to a fan header on the board. This makes the configuration
easier for the user.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 17d648bf

drivers/hwmon/it87.c

+51 −32
Original line number Original line Diff line number Diff line
@@ -222,6 +222,7 @@ struct it87_data { 
	u8 in[9];		/* Register value */

	u8 in[9];		/* Register value */

	u8 in_max[9];		/* Register value */

	u8 in_max[9];		/* Register value */

	u8 in_min[9];		/* Register value */

	u8 in_min[9];		/* Register value */

	u8 has_fan;		/* Bitfield, fans enabled */

	u16 fan[3];		/* Register values, possibly combined */

	u16 fan[3];		/* Register values, possibly combined */

	u16 fan_min[3];		/* Register values, possibly combined */

	u16 fan_min[3];		/* Register values, possibly combined */

	u8 temp[3];		/* Register value */

	u8 temp[3];		/* Register value */
@@ -967,39 +968,52 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind) 
	device_create_file(&new_client->dev, &sensor_dev_attr_temp2_type.dev_attr);

	device_create_file(&new_client->dev, &sensor_dev_attr_temp2_type.dev_attr);

	device_create_file(&new_client->dev, &sensor_dev_attr_temp3_type.dev_attr);

	device_create_file(&new_client->dev, &sensor_dev_attr_temp3_type.dev_attr);





	/* Do not create fan files for disabled fans */

	if (data->type == it8716) { /* 16-bit tachometers */

	if (data->type == it8716) { /* 16-bit tachometers */

		if (data->has_fan & (1 << 0)) {

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan1_input16.dev_attr);

				&sensor_dev_attr_fan1_input16.dev_attr);

		device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan2_input16.dev_attr);

		device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan3_input16.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan1_min16.dev_attr);

				&sensor_dev_attr_fan1_min16.dev_attr);

		}

		if (data->has_fan & (1 << 1)) {

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan2_input16.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan2_min16.dev_attr);

				&sensor_dev_attr_fan2_min16.dev_attr);

		}

		if (data->has_fan & (1 << 2)) {

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan3_input16.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan3_min16.dev_attr);

				&sensor_dev_attr_fan3_min16.dev_attr);

		}

	} else {

	} else {

		if (data->has_fan & (1 << 0)) {

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan1_input.dev_attr);

				&sensor_dev_attr_fan1_input.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan2_input.dev_attr);

				&sensor_dev_attr_fan1_min.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan3_input.dev_attr);

				&sensor_dev_attr_fan1_div.dev_attr);

		}

		if (data->has_fan & (1 << 1)) {

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan1_min.dev_attr);

				&sensor_dev_attr_fan2_input.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan2_min.dev_attr);

				&sensor_dev_attr_fan2_min.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan3_min.dev_attr);

				&sensor_dev_attr_fan2_div.dev_attr);

		}

		if (data->has_fan & (1 << 2)) {

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan1_div.dev_attr);

				&sensor_dev_attr_fan3_input.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				   &sensor_dev_attr_fan2_div.dev_attr);

				&sensor_dev_attr_fan3_min.dev_attr);

			device_create_file(&new_client->dev,

			device_create_file(&new_client->dev,

				&sensor_dev_attr_fan3_div.dev_attr);

				&sensor_dev_attr_fan3_div.dev_attr);

		}

		}

	}





	device_create_file(&new_client->dev, &dev_attr_alarms);

	device_create_file(&new_client->dev, &dev_attr_alarms);

	if (enable_pwm_interface) {

	if (enable_pwm_interface) {
@@ -1175,11 +1189,12 @@ static void it87_init_client(struct i2c_client *client, struct it87_data *data) 
		data->fan_main_ctrl |= 0x70;

		data->fan_main_ctrl |= 0x70;

		it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);

		it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);

	}

	}

	data->has_fan = (data->fan_main_ctrl >> 4) & 0x07;





	/* Set tachometers to 16-bit mode if needed */

	/* Set tachometers to 16-bit mode if needed */

	if (data->type == it8716) {

	if (data->type == it8716) {

		tmp = it87_read_value(client, IT87_REG_FAN_16BIT);

		tmp = it87_read_value(client, IT87_REG_FAN_16BIT);

		if ((tmp & 0x07) != 0x07) {

		if (~tmp & 0x07 & data->has_fan) {

			dev_dbg(&client->dev,

			dev_dbg(&client->dev,

				"Setting fan1-3 to 16-bit mode\n");

				"Setting fan1-3 to 16-bit mode\n");

			it87_write_value(client, IT87_REG_FAN_16BIT,

			it87_write_value(client, IT87_REG_FAN_16BIT,
@@ -1244,6 +1259,10 @@ static struct it87_data *it87_update_device(struct device *dev) 
		data->in_max[8] = 255;

		data->in_max[8] = 255;





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

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

			/* Skip disabled fans */

			if (!(data->has_fan & (1 << i)))

				continue;



			data->fan_min[i] =

			data->fan_min[i] =

			    it87_read_value(client, IT87_REG_FAN_MIN(i));

			    it87_read_value(client, IT87_REG_FAN_MIN(i));

			data->fan[i] = it87_read_value(client,

			data->fan[i] = it87_read_value(client,
@@ -1266,7 +1285,7 @@ static struct it87_data *it87_update_device(struct device *dev) 
		}

		}





		/* Newer chips don't have clock dividers */

		/* Newer chips don't have clock dividers */

		if (data->type != it8716) {

		if ((data->has_fan & 0x07) && data->type != it8716) {

			i = it87_read_value(client, IT87_REG_FAN_DIV);

			i = it87_read_value(client, IT87_REG_FAN_DIV);

			data->fan_div[0] = i & 0x07;

			data->fan_div[0] = i & 0x07;

			data->fan_div[1] = (i >> 3) & 0x07;

			data->fan_div[1] = (i >> 3) & 0x07;