hwmon: w83627ehf updates

[safe/jmp/linux-2.6] / drivers / hwmon / vt8231.c

diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index 8806302..470a122 100644 (file)
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -2,7 +2,7 @@
        vt8231.c - Part of lm_sensors, Linux kernel modules
                                for hardware monitoring
 
-       Copyright (c) 2005 Roger Lucas <roger@planbit.co.uk>
+       Copyright (c) 2005 Roger Lucas <vt8231@hiddenengine.co.uk>
        Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
                           Aaron M. Marsh <amarsh@sdf.lonestar.org>
 
@@ -35,7 +35,8 @@
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
-#include <asm/io.h>
+#include <linux/acpi.h>
+#include <linux/io.h>
 
 static int force_addr;
 module_param(force_addr, int, 0);
@@ -504,7 +505,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
        case 4: data->fan_div[nr] = 2; break;
        case 8: data->fan_div[nr] = 3; break;
        default:
-               dev_err(dev, "fan_div value %ld not supported."
+               dev_err(dev, "fan_div value %ld not supported. "
                        "Choose one of 1, 2, 4 or 8!\n", val);
                mutex_unlock(&data->update_lock);
                return -EINVAL;
@@ -541,6 +542,28 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+       int bitnr = to_sensor_dev_attr(attr)->index;
+       struct vt8231_data *data = vt8231_update_device(dev);
+       return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
+}
+static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp4_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp5_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp6_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);
+
 static ssize_t show_name(struct device *dev, struct device_attribute
                         *devattr, char *buf)
 {
@@ -549,36 +572,42 @@ static ssize_t show_name(struct device *dev, struct device_attribute
 }
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-static struct attribute *vt8231_attributes_temps[6][4] = {
+static struct attribute *vt8231_attributes_temps[6][5] = {
        {
                &dev_attr_temp1_input.attr,
                &dev_attr_temp1_max_hyst.attr,
                &dev_attr_temp1_max.attr,
+               &sensor_dev_attr_temp1_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_temp2_input.dev_attr.attr,
                &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
                &sensor_dev_attr_temp2_max.dev_attr.attr,
+               &sensor_dev_attr_temp2_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_temp3_input.dev_attr.attr,
                &sensor_dev_attr_temp3_max_hyst.dev_attr.attr,
                &sensor_dev_attr_temp3_max.dev_attr.attr,
+               &sensor_dev_attr_temp3_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_temp4_input.dev_attr.attr,
                &sensor_dev_attr_temp4_max_hyst.dev_attr.attr,
                &sensor_dev_attr_temp4_max.dev_attr.attr,
+               &sensor_dev_attr_temp4_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_temp5_input.dev_attr.attr,
                &sensor_dev_attr_temp5_max_hyst.dev_attr.attr,
                &sensor_dev_attr_temp5_max.dev_attr.attr,
+               &sensor_dev_attr_temp5_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_temp6_input.dev_attr.attr,
                &sensor_dev_attr_temp6_max_hyst.dev_attr.attr,
                &sensor_dev_attr_temp6_max.dev_attr.attr,
+               &sensor_dev_attr_temp6_alarm.dev_attr.attr,
                NULL
        }
 };
@@ -592,36 +621,42 @@ static const struct attribute_group vt8231_group_temps[6] = {
        { .attrs = vt8231_attributes_temps[5] },
 };
 
-static struct attribute *vt8231_attributes_volts[6][4] = {
+static struct attribute *vt8231_attributes_volts[6][5] = {
        {
                &sensor_dev_attr_in0_input.dev_attr.attr,
                &sensor_dev_attr_in0_min.dev_attr.attr,
                &sensor_dev_attr_in0_max.dev_attr.attr,
+               &sensor_dev_attr_in0_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_in1_input.dev_attr.attr,
                &sensor_dev_attr_in1_min.dev_attr.attr,
                &sensor_dev_attr_in1_max.dev_attr.attr,
+               &sensor_dev_attr_in1_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_in2_input.dev_attr.attr,
                &sensor_dev_attr_in2_min.dev_attr.attr,
                &sensor_dev_attr_in2_max.dev_attr.attr,
+               &sensor_dev_attr_in2_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_in3_input.dev_attr.attr,
                &sensor_dev_attr_in3_min.dev_attr.attr,
                &sensor_dev_attr_in3_max.dev_attr.attr,
+               &sensor_dev_attr_in3_alarm.dev_attr.attr,
                NULL
        }, {
                &sensor_dev_attr_in4_input.dev_attr.attr,
                &sensor_dev_attr_in4_min.dev_attr.attr,
                &sensor_dev_attr_in4_max.dev_attr.attr,
+               &sensor_dev_attr_in4_alarm.dev_attr.attr,
                NULL
        }, {
                &dev_attr_in5_input.attr,
                &dev_attr_in5_min.attr,
                &dev_attr_in5_max.attr,
+               &sensor_dev_attr_in5_alarm.dev_attr.attr,
                NULL
        }
 };
@@ -642,6 +677,8 @@ static struct attribute *vt8231_attributes[] = {
        &sensor_dev_attr_fan2_min.dev_attr.attr,
        &sensor_dev_attr_fan1_div.dev_attr.attr,
        &sensor_dev_attr_fan2_div.dev_attr.attr,
+       &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan2_alarm.dev_attr.attr,
        &dev_attr_alarms.attr,
        &dev_attr_name.attr,
        NULL
@@ -676,7 +713,7 @@ static struct pci_driver vt8231_pci_driver = {
        .probe          = vt8231_pci_probe,
 };
 
-int vt8231_probe(struct platform_device *pdev)
+static int vt8231_probe(struct platform_device *pdev)
 {
        struct resource *res;
        struct vt8231_data *data;
@@ -858,6 +895,10 @@ static int __devinit vt8231_device_add(unsigned short address)
        };
        int err;
 
+       err = acpi_check_resource_conflict(&res);
+       if (err)
+               goto exit;
+
        pdev = platform_device_alloc("vt8231", address);
        if (!pdev) {
                err = -ENOMEM;
@@ -963,7 +1004,7 @@ static void __exit sm_vt8231_exit(void)
        }
 }
 
-MODULE_AUTHOR("Roger Lucas <roger@planbit.co.uk>");
+MODULE_AUTHOR("Roger Lucas <vt8231@hiddenengine.co.uk>");
 MODULE_DESCRIPTION("VT8231 sensors");
 MODULE_LICENSE("GPL");