Commit 1b907b83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v6.10-rc2' of... 

Merge tag 'hwmon-for-v6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - sttcs: Fix property spelling

 - intel-m10-bmc-hwmon: Fix multiplier for N6000 board power sensor

 - ltc2992: Fix memory leak

 - dell-smm: Add Dell G15 5511 to fan control whitelist

* tag 'hwmon-for-v6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (shtc1) Fix property misspelling
  hwmon: (intel-m10-bmc-hwmon) Fix multiplier for N6000 board power sensor
  hwmon: (ltc2992) Fix memory leak in ltc2992_parse_dt()
  hwmon: (dell-smm) Add Dell G15 5511 to fan control whitelist
parents b7087cb3 52a2c70c

drivers/hwmon/dell-smm-hwmon.c

+8 −0
Original line number Diff line number Diff line
@@ -1545,6 +1545,14 @@ static const struct dmi_system_id i8k_whitelist_fan_control[] __initconst = { 
		},

		.driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3],

	},

	{

		.ident = "Dell G15 5511",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Dell G15 5511"),

		},

		.driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3],

	},

	{ }

};

drivers/hwmon/intel-m10-bmc-hwmon.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static const struct m10bmc_sdata n6000bmc_curr_tbl[] = { 
};



static const struct m10bmc_sdata n6000bmc_power_tbl[] = {

	{ 0x724, 0x0, 0x0, 0x0, 0x0, 1, "Board Power" },

	{ 0x724, 0x0, 0x0, 0x0, 0x0, 1000, "Board Power" },

};



static const struct hwmon_channel_info * const n6000bmc_hinfo[] = {

drivers/hwmon/ltc2992.c

+3 −1
Original line number Diff line number Diff line
@@ -876,9 +876,11 @@ static int ltc2992_parse_dt(struct ltc2992_state *st) 


		ret = fwnode_property_read_u32(child, "shunt-resistor-micro-ohms", &val);

		if (!ret) {

			if (!val)

			if (!val) {

				fwnode_handle_put(child);

				return dev_err_probe(&st->client->dev, -EINVAL,

						     "shunt resistor value cannot be zero\n");

			}

			st->r_sense_uohm[addr] = val;

		}

	}

drivers/hwmon/shtc1.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int shtc1_probe(struct i2c_client *client) 


	if (np) {

		data->setup.blocking_io = of_property_read_bool(np, "sensirion,blocking-io");

		data->setup.high_precision = !of_property_read_bool(np, "sensicon,low-precision");

		data->setup.high_precision = !of_property_read_bool(np, "sensirion,low-precision");

	} else {

		if (client->dev.platform_data)

			data->setup = *(struct shtc1_platform_data *)dev->platform_data;