releases/upstream/2.6.23-rc1/0022-ACPI-thinkpad-acpi-make-EC-based-thermal-readings.patch

   1 From 3d6f99ca00ccf861305fd8630a21f2e696886708 Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Wed, 18 Jul 2007 23:45:46 -0300
   4 Subject: ACPI: thinkpad-acpi: make EC-based thermal readings non-experimental
   5
   6 Reading the 16 thermal sensors directly from the EC has been stable for
   7 about one year, in all supported ThinkPad models.  Remove its
   8 "experimental" label.
   9
  10 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  11 Signed-off-by: Len Brown <len.brown@intel.com>
  12 ---
  13  Documentation/thinkpad-acpi.txt |   18 +++++-------------
  14  drivers/misc/thinkpad_acpi.c    |    2 +-
  15  2 files changed, 6 insertions(+), 14 deletions(-)
  16
  17 diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
  18 index 5d827de..3eb949e 100644
  19 --- a/Documentation/thinkpad-acpi.txt
  20 +++ b/Documentation/thinkpad-acpi.txt
  21 @@ -710,23 +710,15 @@ Temperature sensors
  22  procfs: /proc/acpi/ibm/thermal
  23  sysfs device attributes: (hwmon) temp*_input
  24
  25 -Most ThinkPads include six or more separate temperature sensors but
  26 -only expose the CPU temperature through the standard ACPI methods.
  27 -This feature shows readings from up to eight different sensors on older
  28 -ThinkPads, and it has experimental support for up to sixteen different
  29 -sensors on newer ThinkPads.
  30 -
  31 -EXPERIMENTAL: The 16-sensors feature is marked EXPERIMENTAL because the
  32 -implementation directly accesses hardware registers and may not work as
  33 -expected. USE WITH CAUTION! To use this feature, you need to supply the
  34 -experimental=1 parameter when loading the module.  When EXPERIMENTAL
  35 -mode is enabled, reading the first 8 sensors on newer ThinkPads will
  36 -also use an new experimental thermal sensor access mode.
  37 +Most ThinkPads include six or more separate temperature sensors but only
  38 +expose the CPU temperature through the standard ACPI methods.  This
  39 +feature shows readings from up to eight different sensors on older
  40 +ThinkPads, and up to sixteen different sensors on newer ThinkPads.
  41
  42  For example, on the X40, a typical output may be:
  43  temperatures:   42 42 45 41 36 -128 33 -128
  44
  45 -EXPERIMENTAL: On the T43/p, a typical output may be:
  46 +On the T43/p, a typical output may be:
  47  temperatures:   48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128
  48
  49  The mapping of thermal sensors to physical locations varies depending on
  50 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
  51 index f74d7d6..84a1000 100644
  52 --- a/drivers/misc/thinkpad_acpi.c
  53 +++ b/drivers/misc/thinkpad_acpi.c
  54 @@ -2709,7 +2709,7 @@ static int __init thermal_init(struct ibm_init_struct *iibm)
  55
  56         acpi_tmp7 = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
  57
  58 -       if (thinkpad_id.ec_model && experimental) {
  59 +       if (thinkpad_id.ec_model) {
  60                 /*
  61                  * Direct EC access mode: sensors at registers
  62                  * 0x78-0x7F, 0xC0-0xC7.  Registers return 0x00 for
  63 --
  64 1.5.2.1
  65