Skip to content

Commit 05749ec

Browse files
committed
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
2 parents 09f6b0c + 2d6c668 commit 05749ec

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

drivers/hwmon/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ config SENSORS_ADM9240
162162
tristate "Analog Devices ADM9240 and compatibles"
163163
depends on I2C
164164
select HWMON_VID
165+
select REGMAP_I2C
165166
help
166167
If you say yes here you get support for Analog Devices ADM9240,
167168
Dallas DS1780, National Semiconductor LM81 sensor chips.
@@ -223,6 +224,7 @@ config SENSORS_ADT7462
223224
config SENSORS_ADT7470
224225
tristate "Analog Devices ADT7470"
225226
depends on I2C
227+
select REGMAP_I2C
226228
help
227229
If you say yes here you get support for the Analog Devices
228230
ADT7470 temperature monitoring chips.
@@ -999,6 +1001,7 @@ config SENSORS_LTC2990
9991001
config SENSORS_LTC2991
10001002
tristate "Analog Devices LTC2991"
10011003
depends on I2C
1004+
select REGMAP_I2C
10021005
help
10031006
If you say yes here you get support for Analog Devices LTC2991
10041007
Octal I2C Voltage, Current, and Temperature Monitor. The LTC2991
@@ -1146,6 +1149,7 @@ config SENSORS_MAX1619
11461149
config SENSORS_MAX1668
11471150
tristate "Maxim MAX1668 and compatibles"
11481151
depends on I2C
1152+
select REGMAP_I2C
11491153
help
11501154
If you say yes here you get support for MAX1668, MAX1989 and
11511155
MAX1805 chips.
@@ -1275,6 +1279,7 @@ config SENSORS_MAX31790
12751279
config SENSORS_MC34VR500
12761280
tristate "NXP MC34VR500 hardware monitoring driver"
12771281
depends on I2C
1282+
select REGMAP_I2C
12781283
help
12791284
If you say yes here you get support for the temperature and input
12801285
voltage sensors of the NXP MC34VR500.
@@ -2312,6 +2317,7 @@ config SENSORS_TMP464
23122317
config SENSORS_TMP513
23132318
tristate "Texas Instruments TMP513 and compatibles"
23142319
depends on I2C
2320+
select REGMAP_I2C
23152321
help
23162322
If you say yes here you get support for Texas Instruments TMP512,
23172323
and TMP513 temperature and power supply sensor chips.

drivers/hwmon/adt7475.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,11 +1735,10 @@ static int adt7475_pwm_properties_parse_args(struct fwnode_handle *fwnode,
17351735
static int adt7475_fan_pwm_config(struct i2c_client *client)
17361736
{
17371737
struct adt7475_data *data = i2c_get_clientdata(client);
1738-
struct fwnode_handle *child;
17391738
struct adt7475_pwm_config cfg = {};
17401739
int ret;
17411740

1742-
device_for_each_child_node(&client->dev, child) {
1741+
device_for_each_child_node_scoped(&client->dev, child) {
17431742
if (!fwnode_property_present(child, "pwms"))
17441743
continue;
17451744

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ static const struct m10bmc_sdata n6000bmc_temp_tbl[] = {
358358
{ 0x4f0, 0x4f4, 0x4f8, 0x52c, 0x0, 500, "Board Top Near FPGA Temperature" },
359359
{ 0x4fc, 0x500, 0x504, 0x52c, 0x0, 500, "Board Bottom Near CVL Temperature" },
360360
{ 0x508, 0x50c, 0x510, 0x52c, 0x0, 500, "Board Top East Near VRs Temperature" },
361-
{ 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "Columbiaville Die Temperature" },
361+
{ 0x514, 0x518, 0x51c, 0x52c, 0x0, 500, "CVL Die Temperature" },
362362
{ 0x520, 0x524, 0x528, 0x52c, 0x0, 500, "Board Rear Side Temperature" },
363363
{ 0x530, 0x534, 0x538, 0x52c, 0x0, 500, "Board Front Side Temperature" },
364364
{ 0x53c, 0x540, 0x544, 0x0, 0x0, 500, "QSFP1 Case Temperature" },

0 commit comments

Comments
 (0)