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

Merge tag 'hwmon-for-linus-v4.11-rc4' of... 

Merge tag 'hwmon-for-linus-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - bug fixes in asus_atk0110, it87 and max31790 drivers

 - added missing API definition to hwmon core

* tag 'hwmon-for-linus-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (asus_atk0110) fix uninitialized data access
  hwmon: Add missing HWMON_T_ALARM
  hwmon: (it87) Avoid registering the same chip on both SIO addresses
  hwmon: (max31790) Set correct PWM value
parents 4a01fa5e a2125d02

drivers/hwmon/asus_atk0110.c

+3 −0
Original line number Diff line number Diff line
@@ -646,6 +646,9 @@ static int atk_read_value(struct atk_sensor_data *sensor, u64 *value) 
		else

			err = atk_read_value_new(sensor, value);



		if (err)

			return err;



		sensor->is_valid = true;

		sensor->last_updated = jiffies;

		sensor->cached_value = *value;

drivers/hwmon/it87.c

+19 −5
Original line number Diff line number Diff line
@@ -3198,7 +3198,7 @@ static int __init sm_it87_init(void) 
{

	int sioaddr[2] = { REG_2E, REG_4E };

	struct it87_sio_data sio_data;

	unsigned short isa_address;

	unsigned short isa_address[2];

	bool found = false;

	int i, err;
@@ -3208,15 +3208,29 @@ static int __init sm_it87_init(void) 


	for (i = 0; i < ARRAY_SIZE(sioaddr); i++) {

		memset(&sio_data, 0, sizeof(struct it87_sio_data));

		isa_address = 0;

		err = it87_find(sioaddr[i], &isa_address, &sio_data);

		if (err || isa_address == 0)

		isa_address[i] = 0;

		err = it87_find(sioaddr[i], &isa_address[i], &sio_data);

		if (err || isa_address[i] == 0)

			continue;

		/*

		 * Don't register second chip if its ISA address matches

		 * the first chip's ISA address.

		 */

		if (i && isa_address[i] == isa_address[0])

			break;



		err = it87_device_add(i, isa_address, &sio_data);

		err = it87_device_add(i, isa_address[i], &sio_data);

		if (err)

			goto exit_dev_unregister;



		found = true;



		/*

		 * IT8705F may respond on both SIO addresses.

		 * Stop probing after finding one.

		 */

		if (sio_data.type == it87)

			break;

	}



	if (!found) {

drivers/hwmon/max31790.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int max31790_write_pwm(struct device *dev, u32 attr, int channel, 
		data->pwm[channel] = val << 8;

		err = i2c_smbus_write_word_swapped(client,

						   MAX31790_REG_PWMOUT(channel),

						   val);

						   data->pwm[channel]);

		break;

	case hwmon_pwm_enable:

		fan_config = data->fan_config[channel];

include/linux/hwmon.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ enum hwmon_temp_attributes { 
#define HWMON_T_CRIT_HYST	BIT(hwmon_temp_crit_hyst)

#define HWMON_T_EMERGENCY	BIT(hwmon_temp_emergency)

#define HWMON_T_EMERGENCY_HYST	BIT(hwmon_temp_emergency_hyst)

#define HWMON_T_ALARM		BIT(hwmon_temp_alarm)

#define HWMON_T_MIN_ALARM	BIT(hwmon_temp_min_alarm)

#define HWMON_T_MAX_ALARM	BIT(hwmon_temp_max_alarm)

#define HWMON_T_CRIT_ALARM	BIT(hwmon_temp_crit_alarm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE