summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorRaphael Assenat <raph@8d.com>2012-08-16 12:56:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-16 12:33:59 -0700
commitf3261dfb5538e2ff0264fde3050dbd4e922fa296 (patch)
treee7c0181d1178efb6d0ec26f4bbd426e510e998f0 /drivers/w1
parentf3d9d365ff7f36c4e3491ef31788449f419b781b (diff)
downloadlinux-3.10-f3261dfb5538e2ff0264fde3050dbd4e922fa296.tar.gz
linux-3.10-f3261dfb5538e2ff0264fde3050dbd4e922fa296.tar.bz2
linux-3.10-f3261dfb5538e2ff0264fde3050dbd4e922fa296.zip
1-Wire: Add support for the maxim ds1825 temperature sensor
This patch adds support for maxim ds1825 based 1-wire temperature sensors. Signed-off-by: Raphael Assenat <raph@8d.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/slaves/w1_therm.c9
-rw-r--r--drivers/w1/w1_family.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index d90062b211f..92d08e7fcba 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -91,6 +91,11 @@ static struct w1_family w1_therm_family_DS28EA00 = {
.fops = &w1_therm_fops,
};
+static struct w1_family w1_therm_family_DS1825 = {
+ .fid = W1_THERM_DS1825,
+ .fops = &w1_therm_fops,
+};
+
struct w1_therm_family_converter
{
u8 broken;
@@ -120,6 +125,10 @@ static struct w1_therm_family_converter w1_therm_families[] = {
.f = &w1_therm_family_DS28EA00,
.convert = w1_DS18B20_convert_temp
},
+ {
+ .f = &w1_therm_family_DS1825,
+ .convert = w1_DS18B20_convert_temp
+ }
};
static inline int w1_DS18B20_convert_temp(u8 rom[9])
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index b00ada44a89..a1f0ce151d5 100644
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -39,6 +39,7 @@
#define W1_EEPROM_DS2431 0x2D
#define W1_FAMILY_DS2760 0x30
#define W1_FAMILY_DS2780 0x32
+#define W1_THERM_DS1825 0x3B
#define W1_FAMILY_DS2781 0x3D
#define W1_THERM_DS28EA00 0x42