Message ID | 1471658925-43438-1-git-send-email-matthew.weber@rockwellcollins.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On 08/19/2016 07:08 PM, Matt Weber wrote: > ucd90160 sensor reused existing register layout so just a > id addition was required. > > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> > Signed-off-by: Ronak Desai <ronak.desai@rockwellcollins.com> > --- Applied to -next, with some changes: Updated description, ordered chip type alphabetically, added documentation. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 054d3d8..93cf6dd 100644 --- a/drivers/hwmon/pmbus/Kconfig +++ b/drivers/hwmon/pmbus/Kconfig @@ -126,12 +126,12 @@ config SENSORS_TPS40422 be called tps40422. config SENSORS_UCD9000 - tristate "TI UCD90120, UCD90124, UCD9090, UCD90910" + tristate "TI UCD90120, UCD90124, UCD9090, UCD90910, UCD90160" default n help If you say yes here you get hardware monitoring support for TI - UCD90120, UCD90124, UCD9090, UCD90910 Sequencer and System Health - Controllers. + UCD90120, UCD90124, UCD9090, UCD90910, UCD90160 Sequencer and System + Health Controllers. This driver can also be built as a module. If so, the module will be called ucd9000. diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c index fbb1479..5cf25f8 100644 --- a/drivers/hwmon/pmbus/ucd9000.c +++ b/drivers/hwmon/pmbus/ucd9000.c @@ -28,7 +28,7 @@ #include <linux/i2c/pmbus.h> #include "pmbus.h" -enum chips { ucd9000, ucd90120, ucd90124, ucd9090, ucd90910 }; +enum chips { ucd9000, ucd90120, ucd90124, ucd9090, ucd90910, ucd90160 }; #define UCD9000_MONITOR_CONFIG 0xd5 #define UCD9000_NUM_PAGES 0xd6 @@ -114,6 +114,7 @@ static const struct i2c_device_id ucd9000_id[] = { {"ucd90124", ucd90124}, {"ucd9090", ucd9090}, {"ucd90910", ucd90910}, + {"ucd90160", ucd90160}, {} }; MODULE_DEVICE_TABLE(i2c, ucd9000_id);