aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJekyll Lai <jekyll_lai@wistron.com>2010-12-10 13:52:08 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-10 13:52:08 +0000
commitcf9f03ff5ba58a873a7e579878902e561ffd1797 (patch)
tree73464ada953e86210c7b4c5946e0a679f5826c01
parent48984ddc7620d77dafaebaa2b601c403767134ca (diff)
downloadmrst-s0i3-test-cf9f03ff5ba58a873a7e579878902e561ffd1797.tar.gz
mrst-s0i3-test-cf9f03ff5ba58a873a7e579878902e561ffd1797.tar.xz
mrst-s0i3-test-cf9f03ff5ba58a873a7e579878902e561ffd1797.zip
emc1403: added emc1423 support
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 <jekyll_lai@wistron.com> [Updated Kconfig/comments and minor further changes asked for by the hwmon maintainers] Signed-off-by: Alan Cox <alan@linux.intel.com>
-rw-r--r--drivers/hwmon/Kconfig4
-rw-r--r--drivers/hwmon/emc1403.c22
2 files changed, 16 insertions, 10 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e5bdf246766..a740f29d87b 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -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.
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c
index 8dee3f38fdf..76eeb6cb145 100644
--- a/drivers/hwmon/emc1403.c
+++ b/drivers/hwmon/emc1403.c
@@ -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);