Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwmon fixes for v6.12-rc3

Browse Source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAmcJ0JQACgkQyx8mb86f
 mYFLUw//YIj5KHhM+oociasLPKGBflzYzq3WiNAQwSIKq2VVfX9lG9iQBjbzI9h2
 tmtREAInTnO8dQLGexVKTihlqVY/vfMahp7U9d1KfbAmY0hXGLY9SunE2hWt0HN0
 wDRRVzodxFTpk4FehkNRDZMbRkXeTnaCvRz5Rj22gfs1ZW0qc3KBd7IZYX8ehU/x
 KxADCPZTXpeYXO/Mezc0/eCVEn0gkJdLrtE4gBj25OyOwzsVcVJLqxEy3OZlmJ6n
 ngRWDot8NdpoQCbAlvOTijSsWU/5WQORAyhDFB95PivAY4FaNPaeodmiRtfb9cxs
 bqO1UqViLGKcI+I6mB1Mll7O63aAxfeb96o3Po0kWD2znRlutiJuxVSHmh16sdG9
 sil6x3zXtCSOXsQilJW2tIg8ZOXk5UQzy/9npgRtV5QSnqUZBCRzwAyIBVOjgZix
 RJ3vKP9HprjnQUemYLTENEr9Bh26CrYmGE31jHjuDECAGM+VRbYXtAENp4T4boZW
 YlQETZNDVr8a564lAk7hCRRTUEJb7wnoQtScWfhhVspgeY19EaYXTR7RjcMeqrm2
 8uHg3pg3wTZupsBm0Yxc5t8UzF09YcxyzCXdbYrxzg6iN9rWO0E05Avzpk652BF+
 8lYxLSE/Bwk08hIcSIWRTcMWSD8R7lIszL8dJuWVWa0O3XejSWE=
 =lXfx
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-10-12 09:09:04 -07:00
commit 05749ecf5d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hwmon/Kconfig
View File

@ -162,6 +162,7 @@ config SENSORS_ADM9240
tristate "Analog Devices ADM9240 and compatibles"
depends on I2C
select HWMON_VID
select REGMAP_I2C
help
If you say yes here you get support for Analog Devices ADM9240,
Dallas DS1780, National Semiconductor LM81 sensor chips.
@ -223,6 +224,7 @@ config SENSORS_ADT7462
config SENSORS_ADT7470
tristate "Analog Devices ADT7470"
depends on I2C
select REGMAP_I2C
help
If you say yes here you get support for the Analog Devices
ADT7470 temperature monitoring chips.
@ -999,6 +1001,7 @@ config SENSORS_LTC2990
config SENSORS_LTC2991
tristate "Analog Devices LTC2991"
depends on I2C
select REGMAP_I2C
help
If you say yes here you get support for Analog Devices LTC2991
Octal I2C Voltage, Current, and Temperature Monitor. The LTC2991
@ -1146,6 +1149,7 @@ config SENSORS_MAX1619
config SENSORS_MAX1668
tristate "Maxim MAX1668 and compatibles"
depends on I2C
select REGMAP_I2C
help
If you say yes here you get support for MAX1668, MAX1989 and
MAX1805 chips.
@ -1275,6 +1279,7 @@ config SENSORS_MAX31790
config SENSORS_MC34VR500
tristate "NXP MC34VR500 hardware monitoring driver"
depends on I2C
select REGMAP_I2C
help
If you say yes here you get support for the temperature and input
voltage sensors of the NXP MC34VR500.
@ -2312,6 +2317,7 @@ config SENSORS_TMP464
config SENSORS_TMP513
tristate "Texas Instruments TMP513 and compatibles"
depends on I2C
select REGMAP_I2C
help
If you say yes here you get support for Texas Instruments TMP512,
and TMP513 temperature and power supply sensor chips.

3
drivers/hwmon/adt7475.c
View File

@ -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)
{
struct adt7475_data *data = i2c_get_clientdata(client);
struct fwnode_handle *child;
struct adt7475_pwm_config cfg = {};
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"))
continue;

2
drivers/hwmon/intel-m10-bmc-hwmon.c
View File

@ -358,7 +358,7 @@ static const struct m10bmc_sdata n6000bmc_temp_tbl[] = {
{ 0x4f0, 0x4f4, 0x4f8, 0x52c, 0x0, 500, "Board Top Near FPGA Temperature" },
{ 0x4fc, 0x500, 0x504, 0x52c, 0x0, 500, "Board Bottom Near CVL 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" },
{ 0x530, 0x534, 0x538, 0x52c, 0x0, 500, "Board Front Side Temperature" },
{ 0x53c, 0x540, 0x544, 0x0, 0x0, 500, "QSFP1 Case Temperature" },