diff mbox series

[2/2] hwmon: (lm75) Add Atmel AT30TS74 support

Message ID 7160dc31-1429-1206-ec4b-1d8cc0652b27@axentia.se (mailing list archive)
State Changes Requested
Headers show
Series Add support for Atmel AT30TS74 | expand

Commit Message

Peter Rosin April 25, 2022, 5:59 a.m. UTC
Atmel (now Microchip) AT30TS74 is an LM75 compatible sensor. Add it.

Signed-off-by: Peter Rosin <peda@axentia.se>
---
  drivers/hwmon/Kconfig |  1 +
  drivers/hwmon/lm75.c  | 14 ++++++++++++++
  2 files changed, 15 insertions(+)

Comments

Guenter Roeck April 25, 2022, 6:29 p.m. UTC | #1
Peter,

On Mon, Apr 25, 2022 at 07:59:18AM +0200, Peter Rosin wrote:
> Atmel (now Microchip) AT30TS74 is an LM75 compatible sensor. Add it.
> 
> Signed-off-by: Peter Rosin <peda@axentia.se>

This and the previous patch of the series fail to apply with

error: patch failed: drivers/hwmon/Kconfig:1248
error: drivers/hwmon/Kconfig: patch does not apply
error: patch failed: drivers/hwmon/lm75.c:26
error: drivers/hwmon/lm75.c: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.

when I try to apply with "git am -s -3".

This is probably because MS Exchange tries to be intelligent.
In the first patch, it added a space at the beginning of each
unchanged line. It looks like it did the same or something
similar here. I tried but failed to fix it up.

Please resend as clean patch.

Thanks,
Guenter

> ---
>   drivers/hwmon/Kconfig |  1 +
>   drivers/hwmon/lm75.c  | 14 ++++++++++++++
>   2 files changed, 15 insertions(+)
> 
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 68a8a27ab3b7..d8dc58b2c55a 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -1248,6 +1248,7 @@ config SENSORS_LM75
>   	  temperature sensor chip, with models including:
>   
>   		- Analog Devices ADT75
> +		- Atmel (now Microchip) AT30TS74
>   		- Dallas Semiconductor DS75, DS1775 and DS7505
>   		- Global Mixed-mode Technology (GMT) G751
>   		- Maxim MAX6625 and MAX6626
> diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
> index afdbb63237b9..66dc826f7962 100644
> --- a/drivers/hwmon/lm75.c
> +++ b/drivers/hwmon/lm75.c
> @@ -26,6 +26,7 @@
>   
>   enum lm75_type {		/* keep sorted in alphabetical order */
>   	adt75,
> +	at30ts74,
>   	ds1775,
>   	ds75,
>   	ds7505,
> @@ -128,6 +129,14 @@ static const struct lm75_params device_params[] = {
>   		.default_resolution = 12,
>   		.default_sample_time = MSEC_PER_SEC / 10,
>   	},
> +	[at30ts74] = {
> +		.set_mask = 3 << 5,	/* 12-bit mode*/
> +		.default_resolution = 12,
> +		.default_sample_time = 200,
> +		.num_sample_times = 4,
> +		.sample_times = (unsigned int []){ 25, 50, 100, 200 },
> +		.resolutions = (u8 []) {9, 10, 11, 12 },
> +	},
>   	[ds1775] = {
>   		.clr_mask = 3 << 5,
>   		.set_mask = 2 << 5,	/* 11-bit mode */
> @@ -645,6 +654,7 @@ static int lm75_probe(struct i2c_client *client)
>   
>   static const struct i2c_device_id lm75_ids[] = {
>   	{ "adt75", adt75, },
> +	{ "at30ts74", at30ts74, },
>   	{ "ds1775", ds1775, },
>   	{ "ds75", ds75, },
>   	{ "ds7505", ds7505, },
> @@ -680,6 +690,10 @@ static const struct of_device_id __maybe_unused lm75_of_match[] = {
>   		.compatible = "adi,adt75",
>   		.data = (void *)adt75
>   	},
> +	{
> +		.compatible = "atmel,at30ts74",
> +		.data = (void *)at30ts74
> +	},
>   	{
>   		.compatible = "dallas,ds1775",
>   		.data = (void *)ds1775
Peter Rosin April 25, 2022, 8:33 p.m. UTC | #2
2022-04-25 at 20:29, Guenter Roeck wrote:
> Peter,
> 
> On Mon, Apr 25, 2022 at 07:59:18AM +0200, Peter Rosin wrote:
>> Atmel (now Microchip) AT30TS74 is an LM75 compatible sensor. Add it.
>>
>> Signed-off-by: Peter Rosin <peda@axentia.se>
> 
> This and the previous patch of the series fail to apply with
> 
> error: patch failed: drivers/hwmon/Kconfig:1248
> error: drivers/hwmon/Kconfig: patch does not apply
> error: patch failed: drivers/hwmon/lm75.c:26
> error: drivers/hwmon/lm75.c: patch does not apply
> error: Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> 
> when I try to apply with "git am -s -3".
> 
> This is probably because MS Exchange tries to be intelligent.
> In the first patch, it added a space at the beginning of each
> unchanged line. It looks like it did the same or something
> similar here. I tried but failed to fix it up.
> 
> Please resend as clean patch.

After some experimentation, the culprit turned out to be Thunderbird
and its "flowed" text messages. I'll disable that and resend.

Sorry for wasting time...

Cheers,
Peter
diff mbox series

Patch

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 68a8a27ab3b7..d8dc58b2c55a 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1248,6 +1248,7 @@  config SENSORS_LM75
  	  temperature sensor chip, with models including:
  
  		- Analog Devices ADT75
+		- Atmel (now Microchip) AT30TS74
  		- Dallas Semiconductor DS75, DS1775 and DS7505
  		- Global Mixed-mode Technology (GMT) G751
  		- Maxim MAX6625 and MAX6626
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index afdbb63237b9..66dc826f7962 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -26,6 +26,7 @@ 
  
  enum lm75_type {		/* keep sorted in alphabetical order */
  	adt75,
+	at30ts74,
  	ds1775,
  	ds75,
  	ds7505,
@@ -128,6 +129,14 @@  static const struct lm75_params device_params[] = {
  		.default_resolution = 12,
  		.default_sample_time = MSEC_PER_SEC / 10,
  	},
+	[at30ts74] = {
+		.set_mask = 3 << 5,	/* 12-bit mode*/
+		.default_resolution = 12,
+		.default_sample_time = 200,
+		.num_sample_times = 4,
+		.sample_times = (unsigned int []){ 25, 50, 100, 200 },
+		.resolutions = (u8 []) {9, 10, 11, 12 },
+	},
  	[ds1775] = {
  		.clr_mask = 3 << 5,
  		.set_mask = 2 << 5,	/* 11-bit mode */
@@ -645,6 +654,7 @@  static int lm75_probe(struct i2c_client *client)
  
  static const struct i2c_device_id lm75_ids[] = {
  	{ "adt75", adt75, },
+	{ "at30ts74", at30ts74, },
  	{ "ds1775", ds1775, },
  	{ "ds75", ds75, },
  	{ "ds7505", ds7505, },
@@ -680,6 +690,10 @@  static const struct of_device_id __maybe_unused lm75_of_match[] = {
  		.compatible = "adi,adt75",
  		.data = (void *)adt75
  	},
+	{
+		.compatible = "atmel,at30ts74",
+		.data = (void *)at30ts74
+	},
  	{
  		.compatible = "dallas,ds1775",
  		.data = (void *)ds1775