Add support for the Philips SA56004 temperature sensor.
Subsystems (3)
PATCH 1/1 Add support for the Philips SA56004 temperature sensor.
From: Stijn Devriendt <[email protected]>
Add support for the Philips SA56004, an LM86
compatible temperature sensor.
--- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/lm90.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-)
drivers/hwmon/Kconfig +1 -1
@@ -620,7 +620,7 @@ config SENSORS_LM90 LM86, LM89 and LM99, Analog Devices ADM1032, ADT7461, and ADT7461A, Maxim MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680, MAX6681, MAX6692, MAX6695, MAX6696, ON Semiconductor NCT1008, - and Winbond/Nuvoton W83L771W/G/AWG/ASG sensor chips. + Winbond/Nuvoton W83L771W/G/AWG/ASG and Philips SA56004 sensor chips. This driver can also be built as a module. If so, the module will be called lm90.
drivers/hwmon/lm90.c +44 -3
130 lines not on this page · raw message
Signature · 7 lines
1.7.3.3 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 16 lines · On Thu, May 19, 2011 at 10:10:53AM -0400, [email protected] wrote:
From: Stijn Devriendt <[email protected]>
Add support for the Philips SA56004, an LM86
compatible temperature sensor.Signed-off-by Stijn Devriendt <[email protected]>--- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/lm90.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-)drivers/hwmon/Kconfig +0
-0
drivers/hwmon/Kconfig config SENSORS_LM90 · line 624
Quoted 6 lines
drivers/hwmon/Kconfig +1
-1@@ -620,7 +620,7 @@ config SENSORS_LM90 LM86, LM89 and LM99, Analog Devices ADM1032, ADT7461, and ADT7461A, Maxim MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680, MAX6681, MAX6692, MAX6695, MAX6696, ON Semiconductor NCT1008, - and Winbond/Nuvoton W83L771W/G/AWG/ASG sensor chips. + Winbond/Nuvoton W83L771W/G/AWG/ASG and Philips SA56004 sensor chips.
Please also update Documentation/hwmon/lm90.
Quoted 54 lines
drivers/hwmon/Kconfig +0
-0This driver can also be built as a module. If so, the module will be called lm90.drivers/hwmon/lm90.c +12
-2@@ -54,6 +54,9 @@* and extended mode. They are mostly compatible with LM90 except for a data * format difference for the temperature value registers. * +* This driver also supports the SA56004 from Philips. This device is +* pin-compatible with the LM86, the ED/EDP parts are also address-compatible. +* * Since the LM90 was the first chipset supported by this driver, most * comments will refer to this chipset, but are actually general and * concern all supported chipsets, unless mentioned otherwise. @@ -96,13 +99,15 @@* MAX6659 can have address 0x4c, 0x4d or 0x4e. * MAX6680 and MAX6681 can have address 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, * 0x4c, 0x4d or 0x4e. +* SA56004 can have address 0x48 through 0x4F. */ static const unsigned short normal_i2c[] = { -0x18 ,0x19 ,0x1a ,0x29 ,0x2a ,0x2b ,0x4c ,0x4d ,0x4e ,I2C_CLIENT_END }; +0x18 ,0x19 ,0x1a ,0x29 ,0x2a ,0x2b ,0x48 ,0x49 ,0x4a ,0x4b ,0x4c , +0x4d ,0x4e ,0x4f ,I2C_CLIENT_END };enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680, - max6646, w83l771, max6696 }; + max6646, w83l771, max6696, sa56004 };/* * The LM90 registers @@ -152,6 +157,10 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,#define MAX6659_REG_R_LOCAL_EMERG 0x17#define MAX6659_REG_W_LOCAL_EMERG 0x17 +/* SA56004 registers */ + +#define SA56004_REG_R_LOCAL_TEMPL 0x22 +#define LM90_DEF_CONVRATE_RVAL 6/* Def conversion rate register value */ #define LM90_MAX_CONVRATE_MS 16000/* Maximum conversion rate in ms */ @@ -192,6 +201,7 @@ static const struct i2c_device_id lm90_id[] = { { "max6696", max6696 }, { "nct1008", adt7461 }, { "w83l771", w83l771 }, + { "sa56004", sa56004 }, { } };MODULE_DEVICE_TABLE (i2c, lm90_id);
drivers/hwmon/lm90.c struct lm90_params { · line 218
Quoted 5 lines
drivers/hwmon/lm90.c +2
-0@@ -204,6 +214,8 @@ struct lm90_params {u16 alert_alarms;/* Which alarm bits trigger ALERT# */ /* Upper 8 bits for max6695/96 */ u8 max_convrate;/* Maximum conversion rate register value */ +u8 local_ext_offset;/* Local extension register if +LM90_HAVE_LOCAL_EXT is set*/
I really dislike this variable name. "offset" is used as "temperature offset" in the driver, and means a temperature offset, not a register offset (from 0). Something like reg_local_ext or reg_local_templ would be better.
Quoted 41 lines
drivers/hwmon/lm90.c +10
-0};static const struct lm90_params lm90_params[] = {@@ -238,6 +250,7 @@ static const struct lm90_params lm90_params[] = { .flags = LM90_HAVE_LOCAL_EXT, .alert_alarms = 0x7c, .max_convrate = 6, + .local_ext_offset = MAX6657_REG_R_LOCAL_TEMPL, }, [max6657] = { .flags = LM90_HAVE_LOCAL_EXT,@@ -248,6 +261,7 @@ static const struct lm90_params lm90_params[] = { .flags = LM90_HAVE_LOCAL_EXT | LM90_HAVE_EMERGENCY, .alert_alarms = 0x7c, .max_convrate = 8, + .local_ext_offset = MAX6657_REG_R_LOCAL_TEMPL, }, [max6680] = { .flags = LM90_HAVE_OFFSET,@@ -259,12 +273,20 @@ static const struct lm90_params lm90_params[] = { | LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3, .alert_alarms = 0x187c, .max_convrate = 6, + .local_ext_offset = MAX6657_REG_R_LOCAL_TEMPL, }, [w83l771] = { .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT, .alert_alarms = 0x7c, .max_convrate = 8, }, + [sa56004] = { + .flags =LM90_HAVE_OFFSET |LM90_HAVE_REM_LIMIT_EXT + | LM90_HAVE_LOCAL_EXT, + .alert_alarms = 0x7b, + .max_convrate = 9, + .local_ext_offset = SA56004_REG_R_LOCAL_TEMPL, + }, };/*
drivers/hwmon/lm90.c struct lm90_data { · line 312
Quoted 5 lines
drivers/hwmon/lm90.c +1
-0@@ -286,6 +308,7 @@ struct lm90_data {u16 alert_alarms;/* Which alarm bits trigger ALERT# */ /* Upper 8 bits for max6695/96 */ u8 max_convrate;/* Maximum conversion rate */ +u8 local_ext_offset;/* local extension register offset */
Same here (variable name).
Quoted 12 lines
drivers/hwmon/lm90.c +1
-1/* registers values */ s8 temp8[8 ];/* 0: local low limit @@ -454,7 +477,7 @@ static struct lm90_data *lm90_update_device(struct device *dev)if (data->flags &LM90_HAVE_LOCAL_EXT ) {lm90_read16 (client,LM90_REG_R_LOCAL_TEMP , -MAX6657_REG_R_LOCAL_TEMPL , + data->local_ext_offset, &data->temp11[4 ]); }else { if (lm90_read_reg(client, LM90_REG_R_LOCAL_TEMP,
drivers/hwmon/lm90.c static int lm90_detect(struct i2c_client *new_client, · line 1292
Quoted 7 lines
drivers/hwmon/lm90.c +4
-0@@ -1263,6 +1286,12 @@ static int lm90_detect(struct i2c_client *new_client, name ="w83l771" ; } } + }else +if (man_id =0xA1 ) {/* NXP Semiconductor/Philips */ +if (chip_id =0x00 + && address >=0x48 && address <=0x4F ) {
This multi-line split is unnecessary.
Quoted 9 lines
drivers/hwmon/lm90.c +2
-0+ name ="sa56004" ; + } }if (!name) {/* identification failed */ @@ -1372,6 +1401,18 @@ static int lm90_probe(struct i2c_client *new_client,/* Set maximum conversion rate */ data->max_convrate = lm90_params[data->kind].max_convrate;
drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client *new_client, · line 1413
Quoted 10 lines
drivers/hwmon/lm90.c +10
-0+if (data->flags &LM90_HAVE_LOCAL_EXT ) { +if (lm90_params[data->kind].local_ext_offset >0 ) + data->local_ext_offset = + lm90_params[data->kind].local_ext_offset; +else { +dev_err (&new_client->dev, +"Invalid temperature extension register. " +"Accuracy may be limited.\n" ); + data->flags &= (~LM90_HAVE_LOCAL_EXT ); + }
Either { } in both branches of the if statement, or none. ( ) around ~LM90_HAVE_LOCAL_EXT is unnecessary.
I see it as BUG if LM90_HAVE_LOCAL_EXT is set but local_ext_offset isn't. That should be found during coding (or code review), and not be exported to the user. So, from my perspective, the check is unnecessary. I'll leave that up to Jean to decide, though.
In addition to the above, your patch generates several checkpatch errors (trailing whitespace). Please fix.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 6 lines
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]]drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client
Quoted 2 lines
drivers/hwmon/lm90.c +0
-0if (!name) {/* identification failed */ @@ -1372,6 +1401,18 @@ static int lm90_probe(struct i2c_client
*new_client,
Quoted 6 lines
drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client *new_client,
Quoted 6 lines
drivers/hwmon/lm90.c +3
-0/* Set maximum conversion rate */ data->max_convrate = lm90_params[data->kind].max_convrate; +if (data->flags &LM90_HAVE_LOCAL_EXT ) { +if (lm90_params[data->kind].local_ext_offset >0 ) + data->local_ext_offset > > +
lm90_params[data->kind].local_ext_offset;
Quoted 11 lines
drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client *new_client, · line 1413
Quoted 6 lines
drivers/hwmon/lm90.c +6
-0+else { +dev_err (&new_client->dev, +"Invalid temperature extension register. " +"Accuracy may be limited.\n" ); + data->flags &= (~LM90_HAVE_LOCAL_EXT ); + }Either { } in both branches of the if statement, or none. ( ) around ~LM90_HAVE_LOCAL_EXT is unnecessary.
I see it as BUG if
LM90_HAVE_LOCAL_EXTis set butlocal_ext_offset
isn't.
Quoted 1 line
That should be found during coding (or code review), and not be
exported
Quoted 1 line
to the user. So, from my perspective, the check is unnecessary. I'll
leave
Quoted 2 lines
that up to Jean to decide, though.
Do you think a BUG_ON() would be better suited here?
Quoted 1 line
In addition to the above, your patch generates several checkpatch
errors
Quoted 1 line
(trailing whitespace). Please fix.
I recall letting checkpatch yell at me... I'll have another round of it to
be sure.
Thanks,
Stijn
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 24 lines · Stijn Devriendt (sdevrien)
Quoted 6 lines
-----Original Message-----
From: Guenter Roeck [mailto:[email protected]]drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client
Quoted 2 lines
drivers/hwmon/lm90.c +0
-0if (!name) {/* identification failed */ @@ -1372,6 +1401,18 @@ static int lm90_probe(struct i2c_client
*new_client,Quoted 6 lines
drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client *new_client,
Quoted 6 lines
drivers/hwmon/lm90.c +3
-0/* Set maximum conversion rate */ data->max_convrate = lm90_params[data->kind].max_convrate; +if (data->flags &LM90_HAVE_LOCAL_EXT ) { +if (lm90_params[data->kind].local_ext_offset >0 ) + data->local_ext_offset > > > +lm90_params[data->kind].local_ext_offset;
Quoted 11 lines
drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client *new_client, · line 1413
Quoted 6 lines
drivers/hwmon/lm90.c +6
-0+else { +dev_err (&new_client->dev, +"Invalid temperature extension register. " +"Accuracy may be limited.\n" ); + data->flags &= (~LM90_HAVE_LOCAL_EXT ); + }Either { } in both branches of the if statement, or none. ( ) around ~LM90_HAVE_LOCAL_EXT is unnecessary.
I see it as BUG if
LM90_HAVE_LOCAL_EXTis set butlocal_ext_offset
Quoted 9 lines
isn't.
Quoted 1 line
That should be found during coding (or code review), and not be
exported
Quoted 1 line
to the user. So, from my perspective, the check is unnecessary. I'll
leave
Quoted 2 lines
that up to Jean to decide, though.
Do you think a
BUG_ON()would be better suited here?
I would just use
data->local_ext_offset = lm90_params[data->kind].local_ext_offset;
without any conditionals (the if statements just add code without real value), followed by
BUG_ON((data->flags & LM90_HAVE_LOCAL_EXT) && data->local_ext_offset = 0);
if you want to be sure.
Quoted 7 lines
Quoted 1 line
In addition to the above, your patch generates several checkpatch
errors
Quoted 1 line
(trailing whitespace). Please fix.
I recall letting checkpatch yell at me... I'll have another round of it to
be sure.
Try to apply your own patch, and you'll see git complain about whitespace errors.
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [lm-sensors] [PATCH] Add support for the Philips SA56004
In reply to [email protected]I am no expert on HWMON but just want to
add some points.
Quoted 172 lines · Stijn Devriendt
Add support for the Philips SA56004, an LM86
compatible temperature sensor.Changes since v1:
- Updated documentation
- Trace replaced byBUG_ON
- style updatesSigned-off-by Stijn Devriendt <[email protected]>--- Documentation/hwmon/lm90 | 9 ++++++++- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/lm90.c | 39 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 45 insertions(+), 5 deletions(-)Documentation/hwmon/lm90 +5
-1@@ -113,7 +113,11 @@ Supported chips: Prefix: 'w83l771' Addresses scanned: I2C 0x4c Datasheet: Not publicly available, can be requested from Nuvoton - + * Philips/NXP SA56004X + Prefix: 'sa56004' + Addresses scanned: I2C 0x48 through 0x4F + Datasheet: Publicly available at NXP website +http://ics.nxp.com/products/interface/datasheet/sa56004x.pdf
Author: Jean Delvare <[email protected]>
Documentation/hwmon/lm90 +3
-0@@ -193,6 +197,9 @@ W83L771AWG/ASG * The AWG and ASG variants only differ in package format. * Diode ideality factor configuration (remote sensor) at 0xE3 +SA56004X: + * Better local resolution + All temperature values are given in degrees Celsius. Resolution is 1.0 degree for the local temperature, 0.125 degree for the remote temperature, except for the MAX6657, MAX6658 and MAX6659 which have adrivers/hwmon/Kconfig +1
-1@@ -620,7 +620,7 @@ config SENSORS_LM90 LM86, LM89 and LM99, Analog Devices ADM1032, ADT7461, and ADT7461A, Maxim MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680, MAX6681, MAX6692, MAX6695, MAX6696, ON Semiconductor NCT1008, - and Winbond/Nuvoton W83L771W/G/AWG/ASG sensor chips. + Winbond/Nuvoton W83L771W/G/AWG/ASG and Philips SA56004 sensorchips.
This driver can also be built as a module. If so, the module will be called lm90.
drivers/hwmon/lm90.c +0
-0@@ -54,6 +54,9 @@* and extended mode. They are mostly compatible with LM90 except for a data
* format difference for the temperature value registers.
*
+ * This driver also supports the SA56004 from Philips. This device is
+ * pin-compatible with the LM86, the ED/EDP parts are also address-compatible.
+ *
* Since the LM90 was the first chipset supported by this driver, most
* comments will refer to this chipset, but are actually general and
* concern all supported chipsets, unless mentioned otherwise.drivers/hwmon/lm90.c +4
-2@@ -96,13 +99,15 @@* MAX6659 can have address 0x4c, 0x4d or 0x4e. * MAX6680 and MAX6681 can have address 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, * 0x4c, 0x4d or 0x4e. +* SA56004 can have address 0x48 through 0x4F. */ static const unsigned short normal_i2c[] = { -0x18 ,0x19 ,0x1a ,0x29 ,0x2a ,0x2b ,0x4c ,0x4d ,0x4e ,I2C_CLIENT_END }; +0x18 ,0x19 ,0x1a ,0x29 ,0x2a ,0x2b ,0x48 ,0x49 ,0x4a ,0x4b ,0x4c , + 0x4d, 0x4e, 0x4f, I2C_CLIENT_END };enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680, - max6646, w83l771, max6696 }; + max6646, w83l771, max6696, sa56004 };/*
* The LM90 registersdrivers/hwmon/lm90.c +4
-0@@ -152,6 +157,10 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,#define MAX6659_REG_R_LOCAL_EMERG 0x17#define MAX6659_REG_W_LOCAL_EMERG 0x17 +/* SA56004 registers */ + +#define SA56004_REG_R_LOCAL_TEMPL 0x22 +#define LM90_DEF_CONVRATE_RVAL 6/* Def conversion rate register value */
#defineLM90_MAX_CONVRATE_MS16000 /* Maximum conversion rate in ms */drivers/hwmon/lm90.c +14
-0@@ -192,6 +201,7 @@ static const struct i2c_device_id lm90_id[] = { { "max6696", max6696 }, { "nct1008", adt7461 }, { "w83l771", w83l771 }, + { "sa56004", sa56004 }, { } };MODULE_DEVICE_TABLE (i2c, lm90_id);@@ -204,6 +214,8 @@ struct lm90_params {u16 alert_alarms;/* Which alarm bits trigger ALERT# */ /* Upper 8 bits for max6695/96 */ u8 max_convrate;/* Maximum conversion rate register value */ +u8 reg_local_ext;/* Local extension register if +LM90_HAVE_LOCAL_EXT is set*/ };static const struct lm90_params lm90_params[] = {@@ -238,6 +250,7 @@ static const struct lm90_params lm90_params[] = { .flags = LM90_HAVE_LOCAL_EXT, .alert_alarms = 0x7c, .max_convrate = 6, + .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL, }, [max6657] = { .flags = LM90_HAVE_LOCAL_EXT,@@ -248,6 +261,7 @@ static const struct lm90_params lm90_params[] = { .flags = LM90_HAVE_LOCAL_EXT | LM90_HAVE_EMERGENCY, .alert_alarms = 0x7c, .max_convrate = 8, + .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL, }, [max6680] = { .flags = LM90_HAVE_OFFSET,@@ -259,12 +273,20 @@ static const struct lm90_params lm90_params[] = { | LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3, .alert_alarms = 0x187c, .max_convrate = 6, + .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL, }, [w83l771] = { .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT, .alert_alarms = 0x7c, .max_convrate = 8, }, + [sa56004] = { + .flags =LM90_HAVE_OFFSET |LM90_HAVE_REM_LIMIT_EXT + | LM90_HAVE_LOCAL_EXT, + .alert_alarms = 0x7b, + .max_convrate = 9, + .reg_local_ext = SA56004_REG_R_LOCAL_TEMPL, + }, };/* @@ -286,6 +308,7 @@ struct lm90_data {u16 alert_alarms;/* Which alarm bits trigger ALERT# */ /* Upper 8 bits for max6695/96 */ u8 max_convrate;/* Maximum conversion rate */ +u8 reg_local_ext;/* local extension register offset */ /* registers values */ s8 temp8[8 ];/* 0: local low limit
drivers/hwmon/lm90.c static struct lm90_data *lm90_update_device(struct · line 483
Quoted 8 lines
drivers/hwmon/lm90.c +1
-1@@ -454,7 +477,7 @@ static struct lm90_data *lm90_update_device(struct device *dev)if (data->flags &LM90_HAVE_LOCAL_EXT ) {lm90_read16 (client,LM90_REG_R_LOCAL_TEMP , -MAX6657_REG_R_LOCAL_TEMPL , + data->reg_local_ext, &data->temp11[4 ]);
I don't think this variable reg_local_ext should exist as register address should be "# defined" and should not be part of lm90_data but i do see a case here where we are assuming MAX6657 is only having this LM90_HAVE_LOCAL_EXT flag set.So i think we should have some more branching here to detect the device and pass the corresponding register but as i said i am no expert.
Quoted 17 lines
} else { if (lm90_read_reg(client, LM90_REG_R_LOCAL_TEMP,drivers/hwmon/lm90.c +5
-0@@ -1263,6 +1286,11 @@ static int lm90_detect(struct i2c_client *new_client, name ="w83l771" ; } } + }else +if (man_id ==0xA1 ) {/* NXP Semiconductor/Philips */ +if (chip_id ==0x00 && address >=0x48 && address <=0x4F ) { + name ="sa56004" ; + } }if (!name) { /* identification failed */
drivers/hwmon/lm90.c static int lm90_probe(struct i2c_client *new_client, · line 1409
Quoted 10 lines
drivers/hwmon/lm90.c +5
-0@@ -1372,6 +1400,11 @@ static int lm90_probe(struct i2c_client *new_client,/* Set maximum conversion rate */ data->max_convrate = lm90_params[data->kind].max_convrate; +if (data->flags &LM90_HAVE_LOCAL_EXT ) { + data->reg_local_ext = lm90_params[data->kind].reg_local_ext; +BUG_ON (data->reg_local_ext ==0 ); + } +
I think this BUG_ON is too harsh in probe.We generally use pr_err to print if something which is supposed to be set is not set.As BUG_ON will call kernel panic,right?
Quoted 12 lines
drivers/hwmon/lm90.c +0
-0/* Initialize the LM90 chip */ lm90_init_client(new_client);--
1.7.3.3--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 11 lines
From: anish singh [mailto:[email protected]]
I am no expert on HWMON but just want to
add some points.drivers/hwmon/lm90.c +1
-1@@ -454,7 +477,7 @@ static struct lm90_data *lm90_update_device(struct device *dev) if (data->flags & LM90_HAVE_LOCAL_EXT) { lm90_read16(client, LM90_REG_R_LOCAL_TEMP, - MAX6657_REG_R_LOCAL_TEMPL, + data->reg_local_ext, &data->temp11[4]);
Quoted 8 lines
I don't think this variable
reg_local_extshould exist as register address should be "# defined" and should not be part oflm90_databut i do see a case here where we are assuming MAX6657 is only having thisLM90_HAVE_LOCAL_EXTflag set.So i think we should have some more branching here to detect the device and pass the corresponding register but as i said i am no expert.
Only MAX6657 and SA56004 have the local temperature extension register and unfortunately they reside at different offsets. Therefore the probing will detect the right chip and, if supported, use the correct register.
Quoted 11 lines
} else {
if (lm90_read_reg(client,LM90_REG_R_LOCAL_TEMP,drivers/hwmon/lm90.c +5
-0@@ -1372,6 +1400,11 @@ static int lm90_probe(struct i2c_client *new_client, /* Set maximum conversion rate */ data->max_convrate = lm90_params[data->kind].max_convrate; + if (data->flags & LM90_HAVE_LOCAL_EXT) { + data->reg_local_ext = lm90_params[data->kind].reg_local_ext; + BUG_ON(data->reg_local_ext = 0); + } +
Quoted 3 lines
I think this
BUG_ONis too harsh in probe.We generally usepr_errto print if something which is supposed to be set is not set.AsBUG_ONwill call kernel panic,right?
The reason for adding the BUG_ON rather than the error was that it is in fact a coding error when the flag is set without specifying the offset. Such a condition should never make it into a running system and should be caught during coding or review.BUG_ON only does an oops, panic is optional depending on panic_on_oops being set.
Regards,
Stijn
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 31 lines · Stijn Devriendt (sdevrien)
Quoted 11 lines
From: anish singh [mailto:[email protected]]
I am no expert on HWMON but just want to
add some points.drivers/hwmon/lm90.c +1
-1@@ -454,7 +477,7 @@ static struct lm90_data *lm90_update_device(struct device *dev) if (data->flags & LM90_HAVE_LOCAL_EXT) { lm90_read16(client, LM90_REG_R_LOCAL_TEMP, - MAX6657_REG_R_LOCAL_TEMPL, + data->reg_local_ext, &data->temp11[4]);Quoted 8 lines
I don't think this variable
reg_local_extshould exist as register address should be "# defined" and should not be part oflm90_databut i do see a case here where we are assuming MAX6657 is only having thisLM90_HAVE_LOCAL_EXTflag set.So i think we should have some more branching here to detect the device and pass the corresponding register but as i said i am no expert.Only MAX6657 and SA56004 have the local temperature extension register and unfortunately they reside at different offsets. Therefore the probing will detect the right chip and, if supported, use the correct register.
Quoted 6 lines
} else {
if (lm90_read_reg(client,LM90_REG_R_LOCAL_TEMP,drivers/hwmon/lm90.c +0
-0@@ -1372,6 +1400,11 @@ static int lm90_probe(struct i2c_client *new_client, /* Set maximum conversion rate */ data->max_convrate = lm90_params[data->kind].max_convrate;
Quoted 16 lines
Quoted 8 lines
drivers/hwmon/lm90.c +5
-0+ if (data->flags & LM90_HAVE_LOCAL_EXT) { + data->reg_local_ext = lm90_params[data->kind].reg_local_ext; + BUG_ON(data->reg_local_ext = 0); + } +I think this
BUG_ONis too harsh in probe.We generally usepr_errto print if something which is supposed to be set is not set.AsBUG_ONwill call kernel panic,right?The reason for adding the
BUG_ONrather than the error was that it is in fact a coding error when the flag is set without specifying the offset. Such a condition should never make it into a running system and should be caught during coding or review.BUG_ONonly does an oops, panic is optional depending onpanic_on_oopsbeing set.
Maybe use WARN_ON instead ?
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
PATCH 1/1 Add support for the Philips SA56004 temperature sensor.
Add support for the Philips SA56004, an LM86
compatible temperature sensor.
Changes since v1:
- Updated documentation
- Trace replaced by BUG_ON
- style updates
--- Documentation/hwmon/lm90 | 9 ++++++++- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/lm90.c | 39 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 45 insertions(+), 5 deletions(-)
Documentation/hwmon/lm90 +8 -1
@@ -113,7 +113,11 @@ Supported chips: Prefix: 'w83l771' Addresses scanned: I2C 0x4c Datasheet: Not publicly available, can be requested from Nuvoton - + * Philips/NXP SA56004X + Prefix: 'sa56004' + Addresses scanned: I2C 0x48 through 0x4F + Datasheet: Publicly available at NXP website + http://ics.nxp.com/products/interface/datasheet/sa56004x.pdf Author: Jean Delvare <[email protected]>
@@ -193,6 +197,9 @@ W83L771AWG/ASG * The AWG and ASG variants only differ in package format. * Diode ideality factor configuration (remote sensor) at 0xE3 +SA56004X: + * Better local resolution + All temperature values are given in degrees Celsius. Resolution is 1.0 degree for the local temperature, 0.125 degree for the remote temperature, except for the MAX6657, MAX6658 and MAX6659 which have a
drivers/hwmon/Kconfig +1 -1
@@ -620,7 +620,7 @@ config SENSORS_LM90 LM86, LM89 and LM99, Analog Devices ADM1032, ADT7461, and ADT7461A, Maxim MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680, MAX6681, MAX6692, MAX6695, MAX6696, ON Semiconductor NCT1008, - and Winbond/Nuvoton W83L771W/G/AWG/ASG sensor chips. + Winbond/Nuvoton W83L771W/G/AWG/ASG and Philips SA56004 sensor chips. This driver can also be built as a module. If so, the module will be called lm90.
drivers/hwmon/lm90.c +36 -3
@@ -54,6 +54,9 @@* and extended mode. They are mostly compatible with LM90 except for a data * format difference for the temperature value registers. * +* This driver also supports the SA56004 from Philips. This device is +* pin-compatible with the LM86, the ED/EDP parts are also address-compatible. +* * Since the LM90 was the first chipset supported by this driver, most * comments will refer to this chipset, but are actually general and * concern all supported chipsets, unless mentioned otherwise.
@@ -96,13 +99,15 @@* MAX6659 can have address 0x4c, 0x4d or 0x4e. * MAX6680 and MAX6681 can have address 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, * 0x4c, 0x4d or 0x4e. +* SA56004 can have address 0x48 through 0x4F. */ static const unsigned short normal_i2c[] = { -0x18 ,0x19 ,0x1a ,0x29 ,0x2a ,0x2b ,0x4c ,0x4d ,0x4e ,I2C_CLIENT_END }; +0x18 ,0x19 ,0x1a ,0x29 ,0x2a ,0x2b ,0x48 ,0x49 ,0x4a ,0x4b ,0x4c , +0x4d ,0x4e ,0x4f ,I2C_CLIENT_END };enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680, - max6646, w83l771, max6696 }; + max6646, w83l771, max6696, sa56004 };/* * The LM90 registers
@@ -152,6 +157,10 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,#define MAX6659_REG_R_LOCAL_EMERG 0x17#define MAX6659_REG_W_LOCAL_EMERG 0x17 +/* SA56004 registers */ + +#define SA56004_REG_R_LOCAL_TEMPL 0x22 +#define LM90_DEF_CONVRATE_RVAL 6/* Def conversion rate register value */ #define LM90_MAX_CONVRATE_MS 16000/* Maximum conversion rate in ms */
@@ -192,6 +201,7 @@ static const struct i2c_device_id lm90_id[] = { { "max6696", max6696 }, { "nct1008", adt7461 }, { "w83l771", w83l771 }, + { "sa56004", sa56004 }, { } };MODULE_DEVICE_TABLE (i2c, lm90_id);
@@ -204,6 +214,8 @@ struct lm90_params {u16 alert_alarms;/* Which alarm bits trigger ALERT# */ /* Upper 8 bits for max6695/96 */ u8 max_convrate;/* Maximum conversion rate register value */ +u8 reg_local_ext;/* Local extension register if +LM90_HAVE_LOCAL_EXT is set*/ };static const struct lm90_params lm90_params[] = {
@@ -238,6 +250,7 @@ static const struct lm90_params lm90_params[] = { .flags = LM90_HAVE_LOCAL_EXT, .alert_alarms = 0x7c, .max_convrate = 6, + .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL, }, [max6657] = { .flags = LM90_HAVE_LOCAL_EXT,
@@ -248,6 +261,7 @@ static const struct lm90_params lm90_params[] = { .flags = LM90_HAVE_LOCAL_EXT | LM90_HAVE_EMERGENCY, .alert_alarms = 0x7c, .max_convrate = 8, + .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL, }, [max6680] = { .flags = LM90_HAVE_OFFSET,
@@ -259,12 +273,20 @@ static const struct lm90_params lm90_params[] = { | LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3, .alert_alarms = 0x187c, .max_convrate = 6, + .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL, }, [w83l771] = { .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT, .alert_alarms = 0x7c, .max_convrate = 8, }, + [sa56004] = { + .flags =LM90_HAVE_OFFSET |LM90_HAVE_REM_LIMIT_EXT + | LM90_HAVE_LOCAL_EXT, + .alert_alarms = 0x7b, + .max_convrate = 9, + .reg_local_ext = SA56004_REG_R_LOCAL_TEMPL, + }, };/*
@@ -286,6 +308,7 @@ struct lm90_data {u16 alert_alarms;/* Which alarm bits trigger ALERT# */ /* Upper 8 bits for max6695/96 */ u8 max_convrate;/* Maximum conversion rate */ +u8 reg_local_ext;/* local extension register offset */ /* registers values */ s8 temp8[8 ];/* 0: local low limit
@@ -454,7 +477,7 @@ static struct lm90_data *lm90_update_device(struct device *dev)if (data->flags &LM90_HAVE_LOCAL_EXT ) {lm90_read16 (client,LM90_REG_R_LOCAL_TEMP , -MAX6657_REG_R_LOCAL_TEMPL , + data->reg_local_ext, &data->temp11[4 ]); }else { if (lm90_read_reg(client, LM90_REG_R_LOCAL_TEMP,
@@ -1263,6 +1286,11 @@ static int lm90_detect(struct i2c_client *new_client, name ="w83l771" ; } } + }else +if (man_id =0xA1 ) {/* NXP Semiconductor/Philips */ +if (chip_id =0x00 && address >=0x48 && address <=0x4F ) { + name ="sa56004" ; + } }if (!name) {/* identification failed */
@@ -1372,6 +1400,11 @@ static int lm90_probe(struct i2c_client *new_client,/* Set maximum conversion rate */ data->max_convrate = lm90_params[data->kind].max_convrate; +if (data->flags &LM90_HAVE_LOCAL_EXT ) { + data->reg_local_ext = lm90_params[data->kind].reg_local_ext; +BUG_ON (data->reg_local_ext =0 ); + } +/* Initialize the LM90 chip */ lm90_init_client (new_client);
Signature · 7 lines
1.7.3.3 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors