xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (adm1275) enable adm1272 temperature reporting

Browse Source 
[ Upstream commit 9da9c2dc57b2fa2e65521894cb66df4bf615214d ]

adm1272 supports temperature reporting but it is disabled by default.

Tested:
ls temp1_*
temp1_crit           temp1_highest        temp1_max
temp1_crit_alarm     temp1_input          temp1_max_alarm

cat temp1_input
26642

Signed-off-by: Chu Lin <linchuyuan@google.com>
Link: https://lore.kernel.org/r/20210512171043.2433694-1-linchuyuan@google.com
[groeck: Updated subject to reflect correct driver]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Stable-dep-of: b153a0bb4199 ("hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chu Lin
2021-05-12 17:10:43 +00:00
committed by Greg Kroah-Hartman
parent 4610efa404
commit a3c5d148b7
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/hwmon/pmbus/adm1275.c
View File

@@ -611,11 +611,13 @@ static int adm1275_probe(struct i2c_client *client)
tindex = 8; tindex = 8;
info->func[0] |= PMBUS_HAVE_PIN | PMBUS_HAVE_STATUS_INPUT | info->func[0] |= PMBUS_HAVE_PIN | PMBUS_HAVE_STATUS_INPUT |
PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT; PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT |
PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP;
/* Enable VOUT if not enabled (it is disabled by default) */ /* Enable VOUT & TEMP1 if not enabled (disabled by default) */
if (!(config & ADM1278_VOUT_EN)) { if ((config & (ADM1278_VOUT_EN | ADM1278_TEMP1_EN)) !=
config |= ADM1278_VOUT_EN; (ADM1278_VOUT_EN | ADM1278_TEMP1_EN)) {
config |= ADM1278_VOUT_EN | ADM1278_TEMP1_EN;
ret = i2c_smbus_write_byte_data(client, ret = i2c_smbus_write_byte_data(client,
ADM1275_PMON_CONFIG, ADM1275_PMON_CONFIG,
config); config);
@@ -625,10 +627,6 @@ static int adm1275_probe(struct i2c_client *client)
return -ENODEV; return -ENODEV;
} }
} }
if (config & ADM1278_TEMP1_EN)
info->func[0] |=
PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP;
if (config & ADM1278_VIN_EN) if (config & ADM1278_VIN_EN)
info->func[0] |= PMBUS_HAVE_VIN; info->func[0] |= PMBUS_HAVE_VIN;
break; break;