Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (44 commits)
  i2c: Delete the i2c-isa pseudo bus driver
  hwmon: refuse to load abituguru driver on non-Abit boards
  hwmon: fix Abit Uguru3 driver detection on some motherboards
  hwmon/w83627ehf: Be quiet when no chip is found
  hwmon/w83627ehf: No need to initialize fan_min
  hwmon/w83627ehf: Export the thermal sensor types
  hwmon/w83627ehf: Enable VBAT monitoring
  hwmon/w83627ehf: Add support for the VID inputs
  hwmon/w83627ehf: Fix timing issues
  hwmon/w83627ehf: Add error messages for two error cases
  hwmon/w83627ehf: Convert to a platform driver
  hwmon/w83627ehf: Update the Kconfig entry
  make coretemp_device_remove() static
  hwmon: Add LM93 support
  hwmon: Improve the pwmN_enable documentation
  hwmon/smsc47b397: Don't report missing fans as spinning at 82 RPM
  hwmon: Add support for newer uGuru's
  hwmon/f71805f: Add temperature-tracking fan control mode
  hwmon/w83627ehf: Preserve speed reading when changing fan min
  hwmon: fix detection of abituguru volt inputs
  ...

Manual fixup of trivial conflict in MAINTAINERS file

1 files changed, 33 insertions, 12 deletions

diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index bede4d990ea6..d575ee958de5 100644
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -16,9 +16,9 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /*
-    This driver supports the sensor part of the custom Abit uGuru chip found
-    on Abit uGuru motherboards. Note: because of lack of specs the CPU / RAM /
-    etc voltage & frequency control is not supported!
+    This driver supports the sensor part of the first and second revision of
+    the custom Abit uGuru chip found on Abit uGuru motherboards. Note: because
+    of lack of specs the CPU/RAM voltage & frequency control is not supported!
 */
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -31,6 +31,7 @@
 #include <linux/platform_device.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/dmi.h>
 #include <asm/io.h>
 
 /* Banks */
@@ -418,7 +419,7 @@ static int __devinit
 abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
                                    u8 sensor_addr)
 {
-        u8 val, buf[3];
+        u8 val, test_flag, buf[3];
         int i, ret = -ENODEV; /* error is the most common used retval :| */
 
         /* If overriden by the user return the user selected type */
@@ -436,7 +437,7 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
                 return -ENODEV;
 
         /* Test val is sane / usable for sensor type detection. */
-        if ((val < 10u) || (val > 240u)) {
+        if ((val < 10u) || (val > 250u)) {
                 printk(KERN_WARNING ABIT_UGURU_NAME
                         ": bank1-sensor: %d reading (%d) too close to limits, "
                         "unable to determine sensor type, skipping sensor\n",
@@ -449,10 +450,20 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
 
         ABIT_UGURU_DEBUG(2, "testing bank1 sensor %d\n", (int)sensor_addr);
         /* Volt sensor test, enable volt low alarm, set min value ridicously
-           high. If its a volt sensor this should always give us an alarm. */
-        buf[0] = ABIT_UGURU_VOLT_LOW_ALARM_ENABLE;
-        buf[1] = 245;
-        buf[2] = 250;
+           high, or vica versa if the reading is very high. If its a volt
+           sensor this should always give us an alarm. */
+        if (val <= 240u) {
+                buf[0] = ABIT_UGURU_VOLT_LOW_ALARM_ENABLE;
+                buf[1] = 245;
+                buf[2] = 250;
+                test_flag = ABIT_UGURU_VOLT_LOW_ALARM_FLAG;
+        } else {
+                buf[0] = ABIT_UGURU_VOLT_HIGH_ALARM_ENABLE;
+                buf[1] = 5;
+                buf[2] = 10;
+                test_flag = ABIT_UGURU_VOLT_HIGH_ALARM_FLAG;
+        }
+
         if (abituguru_write(data, ABIT_UGURU_SENSOR_BANK1 + 2, sensor_addr,
                         buf, 3) != 3)
                 goto abituguru_detect_bank1_sensor_type_exit;
@@ -469,13 +480,13 @@ abituguru_detect_bank1_sensor_type(struct abituguru_data *data,
                                 sensor_addr, buf, 3,
                                 ABIT_UGURU_MAX_RETRIES) != 3)
                         goto abituguru_detect_bank1_sensor_type_exit;
-                if (buf[0] & ABIT_UGURU_VOLT_LOW_ALARM_FLAG) {
+                if (buf[0] & test_flag) {
                         ABIT_UGURU_DEBUG(2, "  found volt sensor\n");
                         ret = ABIT_UGURU_IN_SENSOR;
                         goto abituguru_detect_bank1_sensor_type_exit;
                 } else
                         ABIT_UGURU_DEBUG(2, "  alarm raised during volt "
-                                "sensor test, but volt low flag not set\n");
+                                "sensor test, but volt range flag not set\n");
         } else
                 ABIT_UGURU_DEBUG(2, "  alarm not raised during volt sensor "
                         "test\n");
@@ -1287,6 +1298,7 @@ abituguru_probe_error:
         for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
                 device_remove_file(&pdev->dev,
                         &abituguru_sysfs_attr[i].dev_attr);
+        platform_set_drvdata(pdev, NULL);
         kfree(data);
         return res;
 }
@@ -1296,13 +1308,13 @@ static int __devexit abituguru_remove(struct platform_device *pdev)
         int i;
         struct abituguru_data *data = platform_get_drvdata(pdev);
 
-        platform_set_drvdata(pdev, NULL);
         hwmon_device_unregister(data->class_dev);
         for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++)
                 device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr);
         for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
                 device_remove_file(&pdev->dev,
                         &abituguru_sysfs_attr[i].dev_attr);
+        platform_set_drvdata(pdev, NULL);
         kfree(data);
 
         return 0;
@@ -1436,6 +1448,15 @@ static int __init abituguru_init(void)
         int address, err;
         struct resource res = { .flags = IORESOURCE_IO };
 
+#ifdef CONFIG_DMI
+        char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
+
+        /* safety check, refuse to load on non Abit motherboards */
+        if (!force && (!board_vendor ||
+                        strcmp(board_vendor, "http://www.abit.com.tw/")))
+                return -ENODEV;
+#endif
+
         address = abituguru_detect();
         if (address < 0)
                 return address;