diff options
author | 2020-09-14 10:08:57 +0200 | |
---|---|---|
committer | 2020-09-14 10:08:57 +0200 | |
commit | 9ef8638bd8c7e06bee087a04af7950cbc6123828 (patch) | |
tree | de145994dfe036dbd2d729c61e043f1a96cef25c /drivers/hwmon/pmbus | |
parent | platform_device: switch to simpler IDA interface (diff) | |
parent | Linux 5.9-rc5 (diff) | |
download | linux-9ef8638bd8c7e06bee087a04af7950cbc6123828.tar.gz linux-9ef8638bd8c7e06bee087a04af7950cbc6123828.tar.bz2 linux-9ef8638bd8c7e06bee087a04af7950cbc6123828.zip |
Merge 5.9-rc5 into driver-core-next
We need the driver core changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/pmbus')
-rw-r--r-- | drivers/hwmon/pmbus/isl68137.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c index 0c622711ef7e..58aa95a3c010 100644 --- a/drivers/hwmon/pmbus/isl68137.c +++ b/drivers/hwmon/pmbus/isl68137.c @@ -67,6 +67,7 @@ enum variants { raa_dmpvr1_2rail, raa_dmpvr2_1rail, raa_dmpvr2_2rail, + raa_dmpvr2_2rail_nontc, raa_dmpvr2_3rail, raa_dmpvr2_hv, }; @@ -241,6 +242,10 @@ static int isl68137_probe(struct i2c_client *client, info->pages = 1; info->read_word_data = raa_dmpvr2_read_word_data; break; + case raa_dmpvr2_2rail_nontc: + info->func[0] &= ~PMBUS_HAVE_TEMP; + info->func[1] &= ~PMBUS_HAVE_TEMP; + fallthrough; case raa_dmpvr2_2rail: info->pages = 2; info->read_word_data = raa_dmpvr2_read_word_data; @@ -304,7 +309,7 @@ static const struct i2c_device_id raa_dmpvr_id[] = { {"raa228000", raa_dmpvr2_hv}, {"raa228004", raa_dmpvr2_hv}, {"raa228006", raa_dmpvr2_hv}, - {"raa228228", raa_dmpvr2_2rail}, + {"raa228228", raa_dmpvr2_2rail_nontc}, {"raa229001", raa_dmpvr2_2rail}, {"raa229004", raa_dmpvr2_2rail}, {} |