Messages in this thread Patch in this message | | | Date | Thu, 13 Sep 2012 09:24:07 -0400 | From | Raphaël Assénat <> | Subject | Re: [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor |
| |
Hello Greg,
On 10/09/12 07:38 PM, Greg KH wrote: > On Thu, Sep 06, 2012 at 10:25:24PM +0400, Evgeniy Polyakov wrote: >> Hi >> >> On Wed, Sep 05, 2012 at 02:07:58PM -0700, Greg KH (greg@kroah.com) wrote: >>>> Greg, please pull it into your tree >>>> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> >>> >>> I can't seem to find the original patch here, can someone please resend >>> it to me, with Evgeniy's ack added to it so I can apply it? >> >> Here is patchwork link >> Do you need it with my ack? >> >> https://patchwork.kernel.org/patch/1272361/ > > That link doesn't have a signed-off-by: from the original author. > > Raphael, can you resend this to me with your signed-off-by: and > Evgeniy's acked-by added?
Certainly, here is the patch with the Signed-off-by and Acked-by lines added.
---
This patch adds support for maxim ds1825 based 1-wire temperature sensors.
Signed-off-by: Raphael Assenat <raph@8d.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
diff --git a/Documentation/w1/slaves/w1_therm b/Documentation/w1/slaves/w1_therm index 0403aaa..874a8ca 100644 --- a/Documentation/w1/slaves/w1_therm +++ b/Documentation/w1/slaves/w1_therm @@ -3,6 +3,7 @@ Kernel driver w1_therm Supported chips: * Maxim ds18*20 based temperature sensors. + * Maxim ds1825 based temperature sensors. Author: Evgeniy Polyakov <johnpol@2ka.mipt.ru> @@ -15,6 +16,7 @@ supported family codes: W1_THERM_DS18S20 0x10 W1_THERM_DS1822 0x22 W1_THERM_DS18B20 0x28 +W1_THERM_DS1825 0x3B Support is provided through the sysfs w1_slave file. Each open and read sequence will initiate a temperature conversion then provide two diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index ff29ae7..b34bf1d 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 874aeb0..b998c30 100644 --- a/drivers/w1/w1_family.h +++ b/drivers/w1/w1_family.h @@ -38,6 +38,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 [unhandled content-type:application/pgp-signature] | |