hwmon/hdaps: Update the list of supported devices

Remove the strange DMI for the R52 (1846AQG)
and add a note to update to latest BIOS in the Kconfig
and source code.

Signed-off-by: Stephan Berberig <s.berberig@arcor.de>
Signed-off-by: Robert Love <rlove@rlove.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e76d91906c99a3ab671dbb9e0736e3e197901efc..39ab2fc128cf909bf31994223ee9148025c23b5c 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -527,6 +527,9 @@ config SENSORS_HDAPS
          This driver also provides an absolute input class device, allowing
          the laptop to act as a pinball machine-esque joystick.
 
+         If your ThinkPad is not recognized by the driver, please update to latest
+         BIOS. This is especially the case for some R52 ThinkPads.
+
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of hdaps.
 

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 0b11698fe5664ae619b8094a271cf67d29d0dc0e..bf759ea545ac593e319fe1d89f12e48b5caba0b9 100644 (file)
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -511,14 +511,14 @@ static int __init hdaps_dmi_match_invert(struct dmi_system_id *id)
 }
 
 /* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
-  "ThinkPad T42p", so the order of the entries matters */
+   "ThinkPad T42p", so the order of the entries matters.
+   If your ThinkPad is not recognized, please update to latest
+   BIOS. This is especially the case for some R52 ThinkPads. */
 static struct dmi_system_id __initdata hdaps_whitelist[] = {
-       HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad H"),
        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p"),
        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
-       HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad H"),       /* R52 (1846AQG) */
        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),