diff options
-rw-r--r-- | Documentation/thinkpad-acpi.txt | 18 | ||||
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 2 |
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 | |||
710 | procfs: /proc/acpi/ibm/thermal | 710 | procfs: /proc/acpi/ibm/thermal |
711 | sysfs device attributes: (hwmon) temp*_input | 711 | sysfs device attributes: (hwmon) temp*_input |
712 | 712 | ||
713 | Most ThinkPads include six or more separate temperature sensors but | 713 | Most ThinkPads include six or more separate temperature sensors but only |
714 | only expose the CPU temperature through the standard ACPI methods. | 714 | expose the CPU temperature through the standard ACPI methods. This |
715 | This feature shows readings from up to eight different sensors on older | 715 | feature shows readings from up to eight different sensors on older |
716 | ThinkPads, and it has experimental support for up to sixteen different | 716 | ThinkPads, and up to sixteen different sensors on newer ThinkPads. |
717 | sensors on newer ThinkPads. | ||
718 | |||
719 | EXPERIMENTAL: The 16-sensors feature is marked EXPERIMENTAL because the | ||
720 | implementation directly accesses hardware registers and may not work as | ||
721 | expected. USE WITH CAUTION! To use this feature, you need to supply the | ||
722 | experimental=1 parameter when loading the module. When EXPERIMENTAL | ||
723 | mode is enabled, reading the first 8 sensors on newer ThinkPads will | ||
724 | also use an new experimental thermal sensor access mode. | ||
725 | 717 | ||
726 | For example, on the X40, a typical output may be: | 718 | For example, on the X40, a typical output may be: |
727 | temperatures: 42 42 45 41 36 -128 33 -128 | 719 | temperatures: 42 42 45 41 36 -128 33 -128 |
728 | 720 | ||
729 | EXPERIMENTAL: On the T43/p, a typical output may be: | 721 | On the T43/p, a typical output may be: |
730 | temperatures: 48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128 | 722 | temperatures: 48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128 |
731 | 723 | ||
732 | The mapping of thermal sensors to physical locations varies depending on | 724 | The 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 |