diff options
author | Guenter Roeck <linux@roeck-us.net> | 2012-02-28 16:18:47 -0500 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2012-03-18 21:27:53 -0400 |
commit | 3360a106f8b4f87d3f3b0f1fd06c0c66fe45a87b (patch) | |
tree | 87ae4a032ab5ff6007208ff68a669a7c2dd75474 /drivers | |
parent | 927112696654f4c96a85aa8a494866cbc6ccfbe6 (diff) |
hwmon: (zl6100) Add support for ZL9101M and ZL9117M
ZL9101M and ZL9117M are compatible to ZL6100. Add support to the zl6100 driver.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/pmbus/Kconfig | 6 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/zl6100.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 9246d0154f74..2ca6a5a4f5a7 100644 --- a/drivers/hwmon/pmbus/Kconfig +++ b/drivers/hwmon/pmbus/Kconfig | |||
@@ -114,9 +114,9 @@ config SENSORS_ZL6100 | |||
114 | default n | 114 | default n |
115 | help | 115 | help |
116 | If you say yes here you get hardware monitoring support for Intersil | 116 | If you say yes here you get hardware monitoring support for Intersil |
117 | ZL2004, ZL2005, ZL2006, ZL2008, ZL2105, ZL2106, ZL6100, and ZL6105 | 117 | ZL2004, ZL2005, ZL2006, ZL2008, ZL2105, ZL2106, ZL6100, ZL6105, |
118 | Digital DC/DC Controllers, as well as for Ericsson BMR450, BMR451, | 118 | ZL9101M, and ZL9117M Digital DC/DC Controllers, as well as for |
119 | BMR462, BMR463, and BMR464. | 119 | Ericsson BMR450, BMR451, BMR462, BMR463, and BMR464. |
120 | 120 | ||
121 | This driver can also be built as a module. If so, the module will | 121 | This driver can also be built as a module. If so, the module will |
122 | be called zl6100. | 122 | be called zl6100. |
diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c index e5bb7355d480..fc5eed8e85bb 100644 --- a/drivers/hwmon/pmbus/zl6100.c +++ b/drivers/hwmon/pmbus/zl6100.c | |||
@@ -28,7 +28,8 @@ | |||
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | #include "pmbus.h" | 29 | #include "pmbus.h" |
30 | 30 | ||
31 | enum chips { zl2004, zl2005, zl2006, zl2008, zl2105, zl2106, zl6100, zl6105 }; | 31 | enum chips { zl2004, zl2005, zl2006, zl2008, zl2105, zl2106, zl6100, zl6105, |
32 | zl9101, zl9117 }; | ||
32 | 33 | ||
33 | struct zl6100_data { | 34 | struct zl6100_data { |
34 | int id; | 35 | int id; |
@@ -152,6 +153,8 @@ static const struct i2c_device_id zl6100_id[] = { | |||
152 | {"zl2106", zl2106}, | 153 | {"zl2106", zl2106}, |
153 | {"zl6100", zl6100}, | 154 | {"zl6100", zl6100}, |
154 | {"zl6105", zl6105}, | 155 | {"zl6105", zl6105}, |
156 | {"zl9101", zl9101}, | ||
157 | {"zl9117", zl9117}, | ||
155 | { } | 158 | { } |
156 | }; | 159 | }; |
157 | MODULE_DEVICE_TABLE(i2c, zl6100_id); | 160 | MODULE_DEVICE_TABLE(i2c, zl6100_id); |