From 9cd0cb32faeb26ca94c518713693512eb1463b92 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 12 Sep 2013 18:17:31 +0000 Subject: [PATCH] Add support for the SMSC EMC6D103 --- CHANGES | 2 ++ lib/chips.c | 1 + lib/chips.h | 1 + prog/sensors/chips.c | 6 ++++-- prog/sensors/main.c | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 28b6290d..31a03c0d 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,7 @@ SVN-HEAD File lm_sensors.lsm: Delete, don't advertise a legacy branch File doc/developers/release_checklist: Skip mail to lsm Library: Handle new chassis intrusion interface (w93792d and w83793) + Add support for the SMSC EMC6D103 Module i2c-ali1563: Remove sparse warnings (2.6 backport) Module i2c-amd8111: Fix timeout handling (2.6 backport) Module i2c-piix4: ATI SB800 is not actually supported @@ -15,6 +16,7 @@ SVN-HEAD Program sensors: Fix a memory leak when a chip name is provided Fix iconv-related build warning in set_degstr Properly support Maxim MAX6650 and MAX6651 + Add support for the SMSC EMC6D103 Program sensors-detect: Fix detection of older DS1621 Rename the modprobe config file to lm_sensors.conf Drop AMD K10 detection (unreliable sensors) diff --git a/lib/chips.c b/lib/chips.c index 9987797a..41b5ece9 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -6469,6 +6469,7 @@ sensors_chip_features sensors_chip_features_list[] = { SENSORS_LM85C_PREFIX, lm85_features }, { SENSORS_EMC6D100_PREFIX, lm85_features }, { SENSORS_EMC6D102_PREFIX, lm85_features }, + { SENSORS_EMC6D103_PREFIX, lm85_features }, { SENSORS_ADM1027_PREFIX, adm1027_features }, { SENSORS_ADT7463_PREFIX, adm1027_features }, { SENSORS_LM83_PREFIX, lm83_features }, diff --git a/lib/chips.h b/lib/chips.h index 519b08da..26980577 100644 --- a/lib/chips.h +++ b/lib/chips.h @@ -397,6 +397,7 @@ #define SENSORS_ADT7463_PREFIX "adt7463" #define SENSORS_EMC6D100_PREFIX "emc6d100" #define SENSORS_EMC6D102_PREFIX "emc6d102" +#define SENSORS_EMC6D103_PREFIX "emc6d103" #define SENSORS_ADM1027_ALARM_MASK 1 /* RW -- alarm_mask */ #define SENSORS_ADM1027_FAN1_PPR 2 /* RW -- fan1_ppr */ diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index ae8e90e0..e217d900 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -1549,12 +1549,14 @@ void print_lm85(const sensors_chip_name *name) char *label; double cur, min, max; int alarms, alarm_mask = 0, valid; - int is1027, is7463, is6d100, xadc; + int is1027, is7463, is6d100, is6d102, xadc; is7463 = !strcmp(name->prefix, "adt7463"); is1027 = is7463 || !strcmp(name->prefix, "adm1027"); is6d100 = !strcmp(name->prefix,"emc6d100") ; - xadc = is1027 || !strcmp(name->prefix, "emc6d102"); + is6d102 = !strcmp(name->prefix, "emc6d102") || + !strcmp(name->prefix, "emc6d103"); + xadc = is1027 || is6d102; if (!sensors_get_feature(*name,SENSORS_LM85_ALARMS,&cur)) alarms = cur + 0.5; diff --git a/prog/sensors/main.c b/prog/sensors/main.c index 2a6f33e3..472fa35b 100644 --- a/prog/sensors/main.c +++ b/prog/sensors/main.c @@ -369,6 +369,7 @@ static struct match matches[] = { { "adt7463", print_lm85 }, { "emc6d100", print_lm85 }, { "emc6d102", print_lm85 }, + { "emc6d103", print_lm85 }, { "lm87", print_lm87 }, { "gl518sm", print_gl518 }, { "gl520sm", print_gl520 },