emc1403: added emc1423 support
PATCH 1/1 emc1403: added emc1423 support
From: Jekyll Lai <[email protected]>
emc1423 uses the similar register and adds a hardware shutdown pin to protect exceed temperature. This function is set by resistor; it's not necessary to do anything in the driver except add the emc1423 pid of 0x23.
---
drivers/hwmon/emc1403.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/hwmon/emc1403.c +1 -1
@@ -278,7 +278,7 @@ static int emc1403_detect(struct i2c_client *client,/* Note: 0x25 is the 1404 which is very similar and this driver could be extended */ id =i2c_smbus_read_byte_data (client,THERMAL_PID_REG ); -if (id !=0x21 ) +if (id !=0x21 && id !=0x23 )/* 0x21:emc1403 0x23:emc1423*/ return -ENODEV ; id =i2c_smbus_read_byte_data (client,THERMAL_REVISION_REG );
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Hi Alan,
Quoted 19 lines · Alan Cox
From: Jekyll Lai <[email protected]>
emc1423 uses the similar register and adds a hardware shutdown pin to protect exceed temperature. This function is set by resistor; it's not necessary to do anything in the driver except add the emc1423 pid of
0x23.Signed-off-by Jekyll Lai <[email protected]>Signed-off-by Alan Cox <[email protected]>---
drivers/hwmon/emc1403.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/hwmon/emc1403.c +0
-0
drivers/hwmon/emc1403.c static int emc1403_detect(struct i2c_client *client, · line 284
Quoted 8 lines
drivers/hwmon/emc1403.c +1
-1@@ -278,7 +278,7 @@ static int emc1403_detect(struct i2c_client *client,/* Note: 0x25 is the 1404 which is very similar and this driver could be extended */ id =i2c_smbus_read_byte_data (client,THERMAL_PID_REG ); -if (id !=0x21 ) +if (id !=0x21 && id !=0x23 )/* 0x21:emc1403 0x23:emc1423*/ return -ENODEV ; id =i2c_smbus_read_byte_data (client,THERMAL_REVISION_REG );
I like small patches, but this time it seems kind of extreme ;)
We need:
* An update to the Kconfig entry, mentioning the new device being supported.
* A new entry in emc1403_idtable.
* That emc1403_detect() writes the right device name to info->type. And an update to the top comment in this function.
Thanks,
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
PATCH 1/1 emc1403: added emc1423 support
In reply to Alan CoxFrom: Jekyll Lai <[email protected]>
emc1423 uses the similar register and adds a hardware shutdown pin to protect exceed temperature. This function is set by resistor; it's not necessary to do anything in the driver except add the emc1423 pid of 0x23.
[Updated Kconfig/comments and minor further changes asked for by the hwmon
maintainers]
---
drivers/hwmon/Kconfig | 4 ++-- drivers/hwmon/emc1403.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-)
drivers/hwmon/Kconfig +2 -2
@@ -789,10 +789,10 @@ config SENSORS_DME1737 will be called dme1737. config SENSORS_EMC1403 - tristate "SMSC EMC1403 thermal sensor" + tristate "SMSC EMC1403/23 thermal sensor" depends on I2C help - If you say yes here you get support for the SMSC EMC1403 + If you say yes here you get support for the SMSC EMC1403/23 temperature monitoring chip. Threshold values can be configured using sysfs.
drivers/hwmon/emc1403.c +14 -8
@@ -269,23 +269,28 @@ static int emc1403_detect(struct i2c_client *client, struct i2c_board_info *info) {int id; -/* Check if thermal chip is SMSC and EMC1403 */ +/* Check if thermal chip is SMSC and EMC1403 or EMC1423 */ id =i2c_smbus_read_byte_data (client,THERMAL_SMSC_ID_REG );if (id !=0x5d )return -ENODEV ; -/* Note: 0x25 is the 1404 which is very similar and this -driver could be extended */ id =i2c_smbus_read_byte_data (client,THERMAL_PID_REG ); -if (id !=0x21 ) -return -ENODEV ; - +switch (id) { +case 0x21 : +strlcpy (info->type,"emc1403" ,I2C_NAME_SIZE ); +break ; +case 0x23 : +strlcpy (info->type,"emc1423" ,I2C_NAME_SIZE ); +break ; +/* Note: 0x25 is the 1404 which is very similar and this +driver could be extended */ +default : +return -ENODEV ; + } id =i2c_smbus_read_byte_data (client,THERMAL_REVISION_REG );if (id !=0x01 )return -ENODEV ; - -strlcpy (info->type,"emc1403" ,I2C_NAME_SIZE );return 0 ; }
@@ -342,6 +347,7 @@ static const unsigned short emc1403_address_list[] = {static const struct i2c_device_id emc1403_idtable[] = { {"emc1403" ,0 }, + {"emc1423" ,0 }, { } };MODULE_DEVICE_TABLE (i2c, emc1403_idtable);
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Jean Delvare
AppliedHi Alan,
Quoted 7 lines · Alan Cox
From: Jekyll Lai <[email protected]>
emc1423 uses the similar register and adds a hardware shutdown pin to protect exceed temperature. This function is set by resistor; it's not necessary to do anything in the driver except add the emc1423 pid of
0x23.Signed-off-by Jekyll Lai <[email protected]>
Quoted 8 lines
[Updated Kconfig/comments and minor further changes asked for by the hwmon
maintainers]Signed-off-by Alan Cox <[email protected]>---
drivers/hwmon/Kconfig | 4 ++-- drivers/hwmon/emc1403.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-)
Thanks for the quick update. However, checkpatch.pl complains:
ERROR: switch and case should be at the same indent #126: FILE: drivers/hwmon/emc1403.c:279:
+ switch (id) {
+ case 0x21:
[...]
+ case 0x23:
[...]
+ default:
total: 1 errors, 0 warnings, 55 lines checked
I humbly suggests that you run checkpatch.pl on every patch before you submit it.
I'll fix that one for you, but please pay attention next time.
Quoted 5 lines
drivers/hwmon/Kconfig +0
-0
drivers/hwmon/Kconfig config SENSORS_DME1737 · line 796
Quoted 10 lines
drivers/hwmon/Kconfig +2
-2@@ -789,10 +789,10 @@ config SENSORS_DME1737 will be called dme1737. config SENSORS_EMC1403 - tristate "SMSC EMC1403 thermal sensor" + tristate "SMSC EMC1403/23 thermal sensor" depends on I2C help - If you say yes here you get support for the SMSC EMC1403 + If you say yes here you get support for the SMSC EMC1403/23 temperature monitoring chip.
I invite you to spell out
Quoted 44 lines
drivers/hwmon/Kconfig +0
-0Threshold values can be configured using sysfs.drivers/hwmon/emc1403.c +13
-8@@ -269,23 +269,28 @@ static int emc1403_detect(struct i2c_client *client, struct i2c_board_info *info) {int id; -/* Check if thermal chip is SMSC and EMC1403 */ +/* Check if thermal chip is SMSC and EMC1403 or EMC1423 */ id =i2c_smbus_read_byte_data (client,THERMAL_SMSC_ID_REG );if (id !=0x5d )return -ENODEV ; -/* Note: 0x25 is the 1404 which is very similar and this -driver could be extended */ id =i2c_smbus_read_byte_data (client,THERMAL_PID_REG ); -if (id !=0x21 ) -return -ENODEV ; - +switch (id) { +case 0x21 : +strlcpy (info->type,"emc1403" ,I2C_NAME_SIZE ); +break ; +case 0x23 : +strlcpy (info->type,"emc1423" ,I2C_NAME_SIZE ); +break ; +/* Note: 0x25 is the 1404 which is very similar and this +driver could be extended */ +default : +return -ENODEV ; + } id =i2c_smbus_read_byte_data (client,THERMAL_REVISION_REG );if (id !=0x01 )return -ENODEV ; - -strlcpy (info->type,"emc1403" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/emc1403.c static const unsigned short emc1403_address_list[] = { · line 353
Quoted 7 lines
drivers/hwmon/emc1403.c +1
-0@@ -342,6 +347,7 @@ static const unsigned short emc1403_address_list[] = {static const struct i2c_device_id emc1403_idtable[] = { {"emc1403" ,0 }, + {"emc1423" ,0 }, { } };MODULE_DEVICE_TABLE (i2c, emc1403_idtable);
Applied, thanks.
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors