aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2013-05-04 08:49:36 -0400
committerJean Delvare <khali@endymion.delvare>2013-05-04 08:49:36 -0400
commit3fbc81e3c0257c756c0955bcb291374d74c11f61 (patch)
treed7066dfd34f7da00f03764a073b583cfb622d2c5
parent0cd2c72d765191f24d7be14366c0413bf139f3e3 (diff)
hwmon: (lm75) Add support for the Dallas/Maxim DS7505
Basically it's the same as the original DS75 but much faster. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--Documentation/hwmon/lm758
-rw-r--r--drivers/hwmon/Kconfig2
-rw-r--r--drivers/hwmon/lm75.c7
3 files changed, 12 insertions, 5 deletions
diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75
index 5e45d0795986..2560a9c6d445 100644
--- a/Documentation/hwmon/lm75
+++ b/Documentation/hwmon/lm75
@@ -12,11 +12,11 @@ Supported chips:
12 Addresses scanned: I2C 0x48 - 0x4f 12 Addresses scanned: I2C 0x48 - 0x4f
13 Datasheet: Publicly available at the National Semiconductor website 13 Datasheet: Publicly available at the National Semiconductor website
14 http://www.national.com/ 14 http://www.national.com/
15 * Dallas Semiconductor DS75, DS1775 15 * Dallas Semiconductor (now Maxim) DS75, DS1775, DS7505
16 Prefixes: 'ds75', 'ds1775' 16 Prefixes: 'ds75', 'ds1775', 'ds7505'
17 Addresses scanned: none 17 Addresses scanned: none
18 Datasheet: Publicly available at the Dallas Semiconductor website 18 Datasheet: Publicly available at the Maxim website
19 http://www.maxim-ic.com/ 19 http://www.maximintegrated.com/
20 * Maxim MAX6625, MAX6626 20 * Maxim MAX6625, MAX6626
21 Prefixes: 'max6625', 'max6626' 21 Prefixes: 'max6625', 'max6626'
22 Addresses scanned: none 22 Addresses scanned: none
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9c333d471433..0428e8a74b19 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -630,7 +630,7 @@ config SENSORS_LM75
630 temperature sensor chip, with models including: 630 temperature sensor chip, with models including:
631 631
632 - Analog Devices ADT75 632 - Analog Devices ADT75
633 - Dallas Semiconductor DS75 and DS1775 633 - Dallas Semiconductor DS75, DS1775 and DS7505
634 - Maxim MAX6625 and MAX6626 634 - Maxim MAX6625 and MAX6626
635 - Microchip MCP980x 635 - Microchip MCP980x
636 - National Semiconductor LM75, LM75A 636 - National Semiconductor LM75, LM75A
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 928341115793..c03b490bba81 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -38,6 +38,7 @@ enum lm75_type { /* keep sorted in alphabetical order */
38 adt75, 38 adt75,
39 ds1775, 39 ds1775,
40 ds75, 40 ds75,
41 ds7505,
41 lm75, 42 lm75,
42 lm75a, 43 lm75a,
43 max6625, 44 max6625,
@@ -202,6 +203,11 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
202 data->resolution = 11; 203 data->resolution = 11;
203 data->sample_time = HZ; 204 data->sample_time = HZ;
204 break; 205 break;
206 case ds7505:
207 set_mask |= 3 << 5; /* 12-bit mode */
208 data->resolution = 12;
209 data->sample_time = HZ / 4;
210 break;
205 case lm75: 211 case lm75:
206 case lm75a: 212 case lm75a:
207 data->resolution = 9; 213 data->resolution = 9;
@@ -289,6 +295,7 @@ static const struct i2c_device_id lm75_ids[] = {
289 { "adt75", adt75, }, 295 { "adt75", adt75, },
290 { "ds1775", ds1775, }, 296 { "ds1775", ds1775, },
291 { "ds75", ds75, }, 297 { "ds75", ds75, },
298 { "ds7505", ds7505, },
292 { "lm75", lm75, }, 299 { "lm75", lm75, },
293 { "lm75a", lm75a, }, 300 { "lm75a", lm75a, },
294 { "max6625", max6625, }, 301 { "max6625", max6625, },