Commit 05749ecf authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-v6.12-rc3' of...

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

Pull hwmon fixes from Guenter Roeck:

 - Add missing dependencies on REGMAP_I2C for several drivers

 - Fix memory leak in adt7475 driver

 - Relabel Columbiaville temperature sensor in intel-m10-bmc-hwmon
   driver to match other sensor labels

* tag 'hwmon-for-v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (max1668) Add missing dependency on REGMAP_I2C
  hwmon: (ltc2991) Add missing dependency on REGMAP_I2C
  hwmon: (adt7470) Add missing dependency on REGMAP_I2C
  hwmon: (adm9240) Add missing dependency on REGMAP_I2C
  hwmon: (mc34vr500) Add missing dependency on REGMAP_I2C
  hwmon: (tmp513) Add missing dependency on REGMAP_I2C
  hwmon: (adt7475) Fix memory leak in adt7475_fan_pwm_config()
  hwmon: intel-m10-bmc-hwmon: relabel Columbiaville to CVL Die Temperature
parents 09f6b0c8 2d6c6689
...@@ -162,6 +162,7 @@ config SENSORS_ADM9240 ...@@ -162,6 +162,7 @@ config SENSORS_ADM9240
tristate "Analog Devices ADM9240 and compatibles" tristate "Analog Devices ADM9240 and compatibles"
depends on I2C depends on I2C
select HWMON_VID select HWMON_VID
select REGMAP_I2C
help help
If you say yes here you get support for Analog Devices ADM9240, If you say yes here you get support for Analog Devices ADM9240,
Dallas DS1780, National Semiconductor LM81 sensor chips. Dallas DS1780, National Semiconductor LM81 sensor chips.
...@@ -223,6 +224,7 @@ config SENSORS_ADT7462 ...@@ -223,6 +224,7 @@ config SENSORS_ADT7462
config SENSORS_ADT7470 config SENSORS_ADT7470
tristate "Analog Devices ADT7470" tristate "Analog Devices ADT7470"
depends on I2C depends on I2C
select REGMAP_I2C
help help
If you say yes here you get support for the Analog Devices If you say yes here you get support for the Analog Devices
ADT7470 temperature monitoring chips. ADT7470 temperature monitoring chips.
...@@ -999,6 +1001,7 @@ config SENSORS_LTC2990 ...@@ -999,6 +1001,7 @@ config SENSORS_LTC2990
config SENSORS_LTC2991 config SENSORS_LTC2991
tristate "Analog Devices LTC2991" tristate "Analog Devices LTC2991"
depends on I2C depends on I2C
select REGMAP_I2C
help help
If you say yes here you get support for Analog Devices LTC2991 If you say yes here you get support for Analog Devices LTC2991
Octal I2C Voltage, Current, and Temperature Monitor. The LTC2991 Octal I2C Voltage, Current, and Temperature Monitor. The LTC2991
...@@ -1146,6 +1149,7 @@ config SENSORS_MAX1619 ...@@ -1146,6 +1149,7 @@ config SENSORS_MAX1619
config SENSORS_MAX1668 config SENSORS_MAX1668
tristate "Maxim MAX1668 and compatibles" tristate "Maxim MAX1668 and compatibles"
depends on I2C depends on I2C
select REGMAP_I2C
help help
If you say yes here you get support for MAX1668, MAX1989 and If you say yes here you get support for MAX1668, MAX1989 and
MAX1805 chips. MAX1805 chips.
...@@ -1275,6 +1279,7 @@ config SENSORS_MAX31790 ...@@ -1275,6 +1279,7 @@ config SENSORS_MAX31790
config SENSORS_MC34VR500 config SENSORS_MC34VR500
tristate "NXP MC34VR500 hardware monitoring driver" tristate "NXP MC34VR500 hardware monitoring driver"
depends on I2C depends on I2C
select REGMAP_I2C
help help
If you say yes here you get support for the temperature and input If you say yes here you get support for the temperature and input
voltage sensors of the NXP MC34VR500. voltage sensors of the NXP MC34VR500.
...@@ -2312,6 +2317,7 @@ config SENSORS_TMP464 ...@@ -2312,6 +2317,7 @@ config SENSORS_TMP464
config SENSORS_TMP513 config SENSORS_TMP513
tristate "Texas Instruments TMP513 and compatibles" tristate "Texas Instruments TMP513 and compatibles"
depends on I2C depends on I2C
select REGMAP_I2C
help help
If you say yes here you get support for Texas Instruments TMP512, If you say yes here you get support for Texas Instruments TMP512,
and TMP513 temperature and power supply sensor chips. and TMP513 temperature and power supply sensor chips.
......
...@@ -1735,11 +1735,10 @@ static int adt7475_pwm_properties_parse_args(struct fwnode_handle *fwnode, ...@@ -1735,11 +1735,10 @@ static int adt7475_pwm_properties_parse_args(struct fwnode_handle *fwnode,
static int adt7475_fan_pwm_config(struct i2c_client *client) static int adt7475_fan_pwm_config(struct i2c_client *client)
{ {
struct adt7475_data *data = i2c_get_clientdata(client); struct adt7475_data *data = i2c_get_clientdata(client);
struct fwnode_handle *child;
struct adt7475_pwm_config cfg = {}; struct adt7475_pwm_config cfg = {};
int ret; int ret;
device_for_each_child_node(&client->dev, child) { device_for_each_child_node_scoped(&client->dev, child) {
if (!fwnode_property_present(child, "pwms")) if (!fwnode_property_present(child, "pwms"))
continue; continue;
......
...@@ -358,7 +358,7 @@ static const struct m10bmc_sdata n6000bmc_temp_tbl[] = { ...@@ -358,7 +358,7 @@ static const struct m10bmc_sdata n6000bmc_temp_tbl[] = {
{ 0x4f0, 0x4f4, 0x4f8, 0x52c, 0x0, 500, "Board Top Near FPGA Temperature" }, { 0x4f0, 0x4f4, 0x4f8, 0x52c, 0x0, 500, "Board Top Near FPGA Temperature" },
{ 0x4fc, 0x500, 0x504, 0x52c, 0x0, 500, "Board Bottom Near CVL Temperature" }, { 0x4fc, 0x500, 0x504, 0x52c, 0x0, 500, "Board Bottom Near CVL Temperature" },
{ 0x508, 0x50c, 0x510, 0x52c, 0x0, 500, "Board Top East Near VRs Temperature" }, { 0x508, 0x50c, 0x510, 0x52c, 0x0, 500, "Board Top East Near VRs Temperature" },
{ 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "Columbiaville Die Temperature" }, { 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "CVL Die Temperature" },
{ 0x520, 0x524, 0x528, 0x52c, 0x0, 500, "Board Rear Side Temperature" }, { 0x520, 0x524, 0x528, 0x52c, 0x0, 500, "Board Rear Side Temperature" },
{ 0x530, 0x534, 0x538, 0x52c, 0x0, 500, "Board Front Side Temperature" }, { 0x530, 0x534, 0x538, 0x52c, 0x0, 500, "Board Front Side Temperature" },
{ 0x53c, 0x540, 0x544, 0x0, 0x0, 500, "QSFP1 Case Temperature" }, { 0x53c, 0x540, 0x544, 0x0, 0x0, 500, "QSFP1 Case Temperature" },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment