linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor
@ 2012-08-16 16:56 Raphael Assenat
  2012-08-18  9:48 ` Evgeniy Polyakov
  0 siblings, 1 reply; 6+ messages in thread
From: Raphael Assenat @ 2012-08-16 16:56 UTC (permalink / raw)
  To: linux-kernel; +Cc: greg, zbr

This patch adds support for maxim ds1825 based 1-wire temperature sensors.

Signed-off-by: Raphael Assenat <raph@8d.com>

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
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor
  2012-08-16 16:56 [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor Raphael Assenat
@ 2012-08-18  9:48 ` Evgeniy Polyakov
  2012-09-05 21:07   ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Evgeniy Polyakov @ 2012-08-18  9:48 UTC (permalink / raw)
  To: Raphael Assenat; +Cc: linux-kernel, greg

Hi

On Thu, Aug 16, 2012 at 12:56:40PM -0400, Raphael Assenat (raph@8d.com) wrote:
> This patch adds support for maxim ds1825 based 1-wire temperature sensors.

Looks good, thank you

> Signed-off-by: Raphael Assenat <raph@8d.com>

Greg, please pull it into your tree
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>

-- 
	Evgeniy Polyakov

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor
  2012-08-18  9:48 ` Evgeniy Polyakov
@ 2012-09-05 21:07   ` Greg KH
  2012-09-06 18:25     ` Evgeniy Polyakov
  0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2012-09-05 21:07 UTC (permalink / raw)
  To: Evgeniy Polyakov; +Cc: Raphael Assenat, linux-kernel

On Sat, Aug 18, 2012 at 01:48:18PM +0400, Evgeniy Polyakov wrote:
> Hi
> 
> On Thu, Aug 16, 2012 at 12:56:40PM -0400, Raphael Assenat (raph@8d.com) wrote:
> > This patch adds support for maxim ds1825 based 1-wire temperature sensors.
> 
> Looks good, thank you
> 
> > Signed-off-by: Raphael Assenat <raph@8d.com>
> 
> 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?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor
  2012-09-05 21:07   ` Greg KH
@ 2012-09-06 18:25     ` Evgeniy Polyakov
  2012-09-10 23:38       ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Evgeniy Polyakov @ 2012-09-06 18:25 UTC (permalink / raw)
  To: Greg KH; +Cc: Raphael Assenat, linux-kernel

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/

-- 
	Evgeniy Polyakov

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor
  2012-09-06 18:25     ` Evgeniy Polyakov
@ 2012-09-10 23:38       ` Greg KH
  2012-09-13 13:24         ` Raphaël Assénat
  0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2012-09-10 23:38 UTC (permalink / raw)
  To: Evgeniy Polyakov; +Cc: Raphael Assenat, linux-kernel

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?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor
  2012-09-10 23:38       ` Greg KH
@ 2012-09-13 13:24         ` Raphaël Assénat
  0 siblings, 0 replies; 6+ messages in thread
From: Raphaël Assénat @ 2012-09-13 13:24 UTC (permalink / raw)
  To: Greg KH; +Cc: Evgeniy Polyakov, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 2828 bytes --]

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
 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-09-13 13:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-16 16:56 [PATCH v2] 1-Wire: Add support for the maxim ds1825 temperature sensor Raphael Assenat
2012-08-18  9:48 ` Evgeniy Polyakov
2012-09-05 21:07   ` Greg KH
2012-09-06 18:25     ` Evgeniy Polyakov
2012-09-10 23:38       ` Greg KH
2012-09-13 13:24         ` Raphaël Assénat

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).