aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/thinkpad-acpi.txt18
-rw-r--r--drivers/misc/thinkpad_acpi.c2
2 files changed, 6 insertions, 14 deletions
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
index 5d827ded34d1..3eb949e14a02 100644
--- a/Documentation/thinkpad-acpi.txt
+++ b/Documentation/thinkpad-acpi.txt
@@ -710,23 +710,15 @@ Temperature sensors
710procfs: /proc/acpi/ibm/thermal 710procfs: /proc/acpi/ibm/thermal
711sysfs device attributes: (hwmon) temp*_input 711sysfs device attributes: (hwmon) temp*_input
712 712
713Most ThinkPads include six or more separate temperature sensors but 713Most ThinkPads include six or more separate temperature sensors but only
714only expose the CPU temperature through the standard ACPI methods. 714expose the CPU temperature through the standard ACPI methods. This
715This feature shows readings from up to eight different sensors on older 715feature shows readings from up to eight different sensors on older
716ThinkPads, and it has experimental support for up to sixteen different 716ThinkPads, and up to sixteen different sensors on newer ThinkPads.
717sensors on newer ThinkPads.
718
719EXPERIMENTAL: The 16-sensors feature is marked EXPERIMENTAL because the
720implementation directly accesses hardware registers and may not work as
721expected. USE WITH CAUTION! To use this feature, you need to supply the
722experimental=1 parameter when loading the module. When EXPERIMENTAL
723mode is enabled, reading the first 8 sensors on newer ThinkPads will
724also use an new experimental thermal sensor access mode.
725 717
726For example, on the X40, a typical output may be: 718For example, on the X40, a typical output may be:
727temperatures: 42 42 45 41 36 -128 33 -128 719temperatures: 42 42 45 41 36 -128 33 -128
728 720
729EXPERIMENTAL: On the T43/p, a typical output may be: 721On the T43/p, a typical output may be:
730temperatures: 48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128 722temperatures: 48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128
731 723
732The mapping of thermal sensors to physical locations varies depending on 724The mapping of thermal sensors to physical locations varies depending on
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index f74d7d600d83..84a1000e4cec 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -2709,7 +2709,7 @@ static int __init thermal_init(struct ibm_init_struct *iibm)
2709 2709
2710 acpi_tmp7 = acpi_evalf(ec_handle, NULL, "TMP7", "qv"); 2710 acpi_tmp7 = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
2711 2711
2712 if (thinkpad_id.ec_model && experimental) { 2712 if (thinkpad_id.ec_model) {
2713 /* 2713 /*
2714 * Direct EC access mode: sensors at registers 2714 * Direct EC access mode: sensors at registers
2715 * 0x78-0x7F, 0xC0-0xC7. Registers return 0x00 for 2715 * 0x78-0x7F, 0xC0-0xC7. Registers return 0x00 for