projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
lm75.c
diff --git
a/drivers/hwmon/lm75.c
b/drivers/hwmon/lm75.c
index 479ffbeed3f8a0c2d3adb1c9f132e43f5a6a9c57..d16dbb33a531792834a4ee2bd2dff078ec78f5c9 100644
(file)
--- a/
drivers/hwmon/lm75.c
+++ b/
drivers/hwmon/lm75.c
@@
-52,6
+52,7
@@
enum lm75_type { /* keep sorted in alphabetical order */
tmp100,
tmp101,
tmp105,
tmp100,
tmp101,
tmp105,
+ tmp112,
tmp175,
tmp275,
tmp75,
tmp175,
tmp275,
tmp75,
@@
-255,6
+256,12
@@
lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
data->sample_time = HZ;
clr_mask |= 1 << 7; /* not one-shot mode */
break;
data->sample_time = HZ;
clr_mask |= 1 << 7; /* not one-shot mode */
break;
+ case tmp112:
+ set_mask |= 3 << 5; /* 12-bit mode */
+ clr_mask |= 1 << 7; /* not one-shot mode */
+ data->resolution = 12;
+ data->sample_time = HZ / 4;
+ break;
case tmp105:
case tmp175:
case tmp275:
case tmp105:
case tmp175:
case tmp275:
@@
-323,6
+330,7
@@
static const struct i2c_device_id lm75_ids[] = {
{ "tmp100", tmp100, },
{ "tmp101", tmp101, },
{ "tmp105", tmp105, },
{ "tmp100", tmp100, },
{ "tmp101", tmp101, },
{ "tmp105", tmp105, },
+ { "tmp112", tmp112, },
{ "tmp175", tmp175, },
{ "tmp275", tmp275, },
{ "tmp75", tmp75, },
{ "tmp175", tmp175, },
{ "tmp275", tmp275, },
{ "tmp75", tmp75, },