aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/pmbus
diff options
context:
space:
mode:
authorGuenter Roeck <guenter.roeck@ericsson.com>2011-10-01 20:35:44 -0400
committerGuenter Roeck <guenter.roeck@ericsson.com>2012-01-05 11:19:28 -0500
commit443830f6fd986b894da2ea7403163a64c0925f54 (patch)
tree7bfee6449602e401538bd88f419907d1a661abca /drivers/hwmon/pmbus
parentbc581e6fcc3bd901d20765638422ef957559a8d1 (diff)
hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]
Add support for Ericsson BMR450, BMR451, BMR462, BMR463, and BMR464, which are based on ZL2005 and ZL2008, to zl6100 driver. Remove BMR450 and BMR451 device IDs from generic PMBus driver. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
Diffstat (limited to 'drivers/hwmon/pmbus')
-rw-r--r--drivers/hwmon/pmbus/Kconfig7
-rw-r--r--drivers/hwmon/pmbus/pmbus.c2
-rw-r--r--drivers/hwmon/pmbus/zl6100.c5
3 files changed, 9 insertions, 5 deletions
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
index d357ab280263..cfec923f42b7 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 ADP4000, BMR450, BMR451, 22 PMBus devices, including but not limited to ADP4000, BMR453, BMR454,
23 BMR453, BMR454, NCP4200, and NCP4208. 23 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.
@@ -114,7 +114,8 @@ config SENSORS_ZL6100
114 help 114 help
115 If you say yes here you get hardware monitoring support for Intersil 115 If you say yes here you get hardware monitoring support for Intersil
116 ZL2004, ZL2005, ZL2006, ZL2008, ZL2105, ZL2106, ZL6100, and ZL6105 116 ZL2004, ZL2005, ZL2006, ZL2008, ZL2105, ZL2106, ZL6100, and ZL6105
117 Digital DC/DC Controllers. 117 Digital DC/DC Controllers, as well as for Ericsson BMR450, BMR451,
118 BMR462, BMR463, and BMR464.
118 119
119 This driver can also be built as a module. If so, the module will 120 This driver can also be built as a module. If so, the module will
120 be called zl6100. 121 be called zl6100.
diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index 995e873197e3..18a385e753d7 100644
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -200,8 +200,6 @@ static int pmbus_remove(struct i2c_client *client)
200 */ 200 */
201static const struct i2c_device_id pmbus_id[] = { 201static const struct i2c_device_id pmbus_id[] = {
202 {"adp4000", 1}, 202 {"adp4000", 1},
203 {"bmr450", 1},
204 {"bmr451", 1},
205 {"bmr453", 1}, 203 {"bmr453", 1},
206 {"bmr454", 1}, 204 {"bmr454", 1},
207 {"ncp4200", 1}, 205 {"ncp4200", 1},
diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c
index d78bdcf467f3..7a72b6e4ff1d 100644
--- a/drivers/hwmon/pmbus/zl6100.c
+++ b/drivers/hwmon/pmbus/zl6100.c
@@ -135,6 +135,11 @@ static int zl6100_write_byte(struct i2c_client *client, int page, u8 value)
135} 135}
136 136
137static const struct i2c_device_id zl6100_id[] = { 137static const struct i2c_device_id zl6100_id[] = {
138 {"bmr450", zl2005},
139 {"bmr451", zl2005},
140 {"bmr462", zl2008},
141 {"bmr463", zl2008},
142 {"bmr464", zl2008},
138 {"zl2004", zl2004}, 143 {"zl2004", zl2004},
139 {"zl2005", zl2005}, 144 {"zl2005", zl2005},
140 {"zl2006", zl2006}, 145 {"zl2006", zl2006},