diff options
| author | Matt Weber <matthew.weber@rockwellcollins.com> | 2016-08-19 22:08:45 -0400 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2016-09-09 00:34:16 -0400 |
| commit | 50b2b02c40340c4ac3fa1e12eb6e600a10c95e72 (patch) | |
| tree | 0ad4ba38a28d07141dac0724e85657298159088d /drivers/hwmon | |
| parent | 43943ebb9f0cee2774df64d48f4a21171acf9c85 (diff) | |
hwmon: (ucd9000) Add support for UCD90160 Power Supply Sequencer
The UCD90160 Power Supply Sequencer reuses the existing register layout,
so just an id addition was required.
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Ronak Desai <ronak.desai@rockwellcollins.com>
[groeck: Updated description, ordered alphabetically, added documentation]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/pmbus/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/hwmon/pmbus/ucd9000.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 054d3d863802..cad1229b7e17 100644 --- a/drivers/hwmon/pmbus/Kconfig +++ b/drivers/hwmon/pmbus/Kconfig | |||
| @@ -126,12 +126,12 @@ config SENSORS_TPS40422 | |||
| 126 | be called tps40422. | 126 | be called tps40422. |
| 127 | 127 | ||
| 128 | config SENSORS_UCD9000 | 128 | config SENSORS_UCD9000 |
| 129 | tristate "TI UCD90120, UCD90124, UCD9090, UCD90910" | 129 | tristate "TI UCD90120, UCD90124, UCD90160, UCD9090, UCD90910" |
| 130 | default n | 130 | default n |
| 131 | help | 131 | help |
| 132 | If you say yes here you get hardware monitoring support for TI | 132 | If you say yes here you get hardware monitoring support for TI |
| 133 | UCD90120, UCD90124, UCD9090, UCD90910 Sequencer and System Health | 133 | UCD90120, UCD90124, UCD90160, UCD9090, UCD90910, Sequencer and System |
| 134 | Controllers. | 134 | Health Controllers. |
| 135 | 135 | ||
| 136 | This driver can also be built as a module. If so, the module will | 136 | This driver can also be built as a module. If so, the module will |
| 137 | be called ucd9000. | 137 | be called ucd9000. |
diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c index fbb1479d3ad4..3e3aa950277f 100644 --- a/drivers/hwmon/pmbus/ucd9000.c +++ b/drivers/hwmon/pmbus/ucd9000.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/i2c/pmbus.h> | 28 | #include <linux/i2c/pmbus.h> |
| 29 | #include "pmbus.h" | 29 | #include "pmbus.h" |
| 30 | 30 | ||
| 31 | enum chips { ucd9000, ucd90120, ucd90124, ucd9090, ucd90910 }; | 31 | enum chips { ucd9000, ucd90120, ucd90124, ucd90160, ucd9090, ucd90910 }; |
| 32 | 32 | ||
| 33 | #define UCD9000_MONITOR_CONFIG 0xd5 | 33 | #define UCD9000_MONITOR_CONFIG 0xd5 |
| 34 | #define UCD9000_NUM_PAGES 0xd6 | 34 | #define UCD9000_NUM_PAGES 0xd6 |
| @@ -112,6 +112,7 @@ static const struct i2c_device_id ucd9000_id[] = { | |||
| 112 | {"ucd9000", ucd9000}, | 112 | {"ucd9000", ucd9000}, |
| 113 | {"ucd90120", ucd90120}, | 113 | {"ucd90120", ucd90120}, |
| 114 | {"ucd90124", ucd90124}, | 114 | {"ucd90124", ucd90124}, |
| 115 | {"ucd90160", ucd90160}, | ||
| 115 | {"ucd9090", ucd9090}, | 116 | {"ucd9090", ucd9090}, |
| 116 | {"ucd90910", ucd90910}, | 117 | {"ucd90910", ucd90910}, |
| 117 | {} | 118 | {} |
