This adds thinkpad support to the temperature module. The temperature is

accessible through the thinkpad_acpi kernel module.

Signed-off-by: Lars Munch <lars@segv.dk>


SVN revision: 56192
This commit is contained in:
Lars Munch 2011-01-16 15:11:56 +00:00 committed by Mike Blumenkrantz
parent e51c9aa23d
commit 343f3737b1
2 changed files with 11 additions and 1 deletions

View File

@ -11,7 +11,8 @@ typedef enum _Sensor_Type
SENSOR_TYPE_LINUX_ACPI, SENSOR_TYPE_LINUX_ACPI,
SENSOR_TYPE_LINUX_PCI, SENSOR_TYPE_LINUX_PCI,
SENSOR_TYPE_LINUX_PBOOK, SENSOR_TYPE_LINUX_PBOOK,
SENSOR_TYPE_LINUX_INTELCORETEMP SENSOR_TYPE_LINUX_INTELCORETEMP,
SENSOR_TYPE_LINUX_THINKPAD
} Sensor_Type; } Sensor_Type;
#endif #endif

View File

@ -125,6 +125,11 @@ init(void)
sensor_type = SENSOR_TYPE_LINUX_INTELCORETEMP; sensor_type = SENSOR_TYPE_LINUX_INTELCORETEMP;
sensor_name = strdup("dummy"); sensor_name = strdup("dummy");
} }
else if (ecore_file_exists("/sys/devices/platform/thinkpad_hwmon/temp1_input"))
{
sensor_type = SENSOR_TYPE_LINUX_THINKPAD;
sensor_name = strdup("dummy");
}
else else
{ {
// try the i2c bus // try the i2c bus
@ -217,6 +222,9 @@ init(void)
case SENSOR_TYPE_LINUX_INTELCORETEMP: case SENSOR_TYPE_LINUX_INTELCORETEMP:
sensor_path = strdup("/sys/devices/platform/coretemp.0/temp1_input"); sensor_path = strdup("/sys/devices/platform/coretemp.0/temp1_input");
break; break;
case SENSOR_TYPE_LINUX_THINKPAD:
sensor_path = strdup("/sys/devices/platform/thinkpad_hwmon/temp1_input");
break;
case SENSOR_TYPE_LINUX_I2C: case SENSOR_TYPE_LINUX_I2C:
therms = ecore_file_ls("/sys/bus/i2c/devices"); therms = ecore_file_ls("/sys/bus/i2c/devices");
@ -330,6 +338,7 @@ check(void)
break; break;
case SENSOR_TYPE_LINUX_INTELCORETEMP: case SENSOR_TYPE_LINUX_INTELCORETEMP:
case SENSOR_TYPE_LINUX_I2C: case SENSOR_TYPE_LINUX_I2C:
case SENSOR_TYPE_LINUX_THINKPAD:
f = fopen(sensor_path, "r"); f = fopen(sensor_path, "r");
if (f) if (f)
{ {