aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <guenter.roeck@ericsson.com>2011-06-25 18:13:44 -0400
committerGuenter Roeck <guenter.roeck@ericsson.com>2011-07-28 18:31:18 -0400
commite0455e380b5bdf8dff7c8e29423d2446d9f59040 (patch)
tree5dfc150168c3660867bafa6baa19d1852ef3be1d /drivers/hwmon
parent1061d8518f8bde548a03a5ff77dbe9a4202ad826 (diff)
hwmon: (pmbus) Add ADP4000, NCP4200 and NCP4208 to list of supported devices
Add ADP4000, NCP4200 and NCP4208 to the list of devices supported by the generic PMBus driver, and add device IDs to enable explicit instantiation. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Reviewed-by: Robert Coulson <robert.coulson@ericsson.com> Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/pmbus/Kconfig4
-rw-r--r--drivers/hwmon/pmbus/pmbus.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
index 794129f4859..0a822a45085 100644
--- a/drivers/hwmon/pmbus/Kconfig
+++ b/drivers/hwmon/pmbus/Kconfig
@@ -19,8 +19,8 @@ config SENSORS_PMBUS
19 default y 19 default y
20 help 20 help
21 If you say yes here you get hardware monitoring support for generic 21 If you say yes here you get hardware monitoring support for generic
22 PMBus devices, including but not limited to BMR450, BMR451, BMR453, 22 PMBus devices, including but not limited to ADP4000, BMR450, BMR451,
23 BMR454, and LTC2978. 23 BMR453, BMR454, LTC2978, NCP4200, and NCP4208.
24 24
25 This driver can also be built as a module. If so, the module will 25 This driver can also be built as a module. If so, the module will
26 be called pmbus. 26 be called pmbus.
diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index 4d8e31bcd7a..73de9f1f319 100644
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -200,11 +200,14 @@ static int pmbus_remove(struct i2c_client *client)
200 * Use driver_data to set the number of pages supported by the chip. 200 * Use driver_data to set the number of pages supported by the chip.
201 */ 201 */
202static const struct i2c_device_id pmbus_id[] = { 202static const struct i2c_device_id pmbus_id[] = {
203 {"adp4000", 1},
203 {"bmr450", 1}, 204 {"bmr450", 1},
204 {"bmr451", 1}, 205 {"bmr451", 1},
205 {"bmr453", 1}, 206 {"bmr453", 1},
206 {"bmr454", 1}, 207 {"bmr454", 1},
207 {"ltc2978", 8}, 208 {"ltc2978", 8},
209 {"ncp4200", 1},
210 {"ncp4208", 1},
208 {"pmbus", 0}, 211 {"pmbus", 0},
209 {} 212 {}
210}; 213};