diff options
-rw-r--r-- | Documentation/hwmon/pmbus | 5 | ||||
-rw-r--r-- | Documentation/hwmon/zl6100 | 11 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/Kconfig | 7 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/pmbus.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/zl6100.c | 5 |
5 files changed, 22 insertions, 8 deletions
diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus index 15ac911ce51b..d28b591753d1 100644 --- a/Documentation/hwmon/pmbus +++ b/Documentation/hwmon/pmbus | |||
@@ -2,9 +2,8 @@ Kernel driver pmbus | |||
2 | ==================== | 2 | ==================== |
3 | 3 | ||
4 | Supported chips: | 4 | Supported chips: |
5 | * Ericsson BMR45X series | 5 | * Ericsson BMR453, BMR454 |
6 | DC/DC Converter | 6 | Prefixes: 'bmr453', 'bmr454' |
7 | Prefixes: 'bmr450', 'bmr451', 'bmr453', 'bmr454' | ||
8 | Addresses scanned: - | 7 | Addresses scanned: - |
9 | Datasheet: | 8 | Datasheet: |
10 | http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146395 | 9 | http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146395 |
diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100 index d3bca065cb7e..51f76a189fee 100644 --- a/Documentation/hwmon/zl6100 +++ b/Documentation/hwmon/zl6100 | |||
@@ -34,6 +34,17 @@ Supported chips: | |||
34 | Prefix: 'zl6105' | 34 | Prefix: 'zl6105' |
35 | Addresses scanned: - | 35 | Addresses scanned: - |
36 | Datasheet: http://www.intersil.com/data/fn/fn6906.pdf | 36 | Datasheet: http://www.intersil.com/data/fn/fn6906.pdf |
37 | * Ericsson BMR450, BMR451 | ||
38 | Prefix: 'bmr450', 'bmr451' | ||
39 | Addresses scanned: - | ||
40 | Datasheet: | ||
41 | http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146401 | ||
42 | * Ericsson BMR462, BMR463, BMR464 | ||
43 | Prefixes: 'bmr462', 'bmr463', 'bmr464' | ||
44 | Addresses scanned: - | ||
45 | Datasheet: | ||
46 | http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256 | ||
47 | |||
37 | 48 | ||
38 | Author: Guenter Roeck <guenter.roeck@ericsson.com> | 49 | Author: Guenter Roeck <guenter.roeck@ericsson.com> |
39 | 50 | ||
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 | */ |
201 | static const struct i2c_device_id pmbus_id[] = { | 201 | static 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 | ||
137 | static const struct i2c_device_id zl6100_id[] = { | 137 | static 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}, |