Patched in Tegra support.

1 files changed, 129 insertions, 188 deletions

diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index a56355cef18..db3b2e8d2a6 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -1,29 +1,28 @@
 /*
- * vt8231.c - Part of lm_sensors, Linux kernel modules
- *            for hardware monitoring
- *
- * 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>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+        vt8231.c - Part of lm_sensors, Linux kernel modules
+                                for hardware monitoring
 
-/*
- * Supports VIA VT8231 South Bridge embedded sensors
- */
+        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>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/* Supports VIA VT8231 South Bridge embedded sensors
+*/
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -51,27 +50,26 @@ static struct platform_device *pdev;
 #define VT8231_BASE_REG 0x70
 #define VT8231_ENABLE_REG 0x74
 
-/*
- * The VT8231 registers
- *
- * The reset value for the input channel configuration is used (Reg 0x4A=0x07)
- * which sets the selected inputs marked with '*' below if multiple options are
- * possible:
- *
- *                  Voltage Mode          Temperature Mode
- *      Sensor        Linux Id        Linux Id        VIA Id
- *      --------      --------        --------        ------
- *      CPU Diode       N/A             temp1           0
- *      UIC1            in0             temp2 *         1
- *      UIC2            in1 *           temp3           2
- *      UIC3            in2 *           temp4           3
- *      UIC4            in3 *           temp5           4
- *      UIC5            in4 *           temp6           5
- *      3.3V            in5             N/A
- *
- * Note that the BIOS may set the configuration register to a different value
- * to match the motherboard configuration.
- */
+/* The VT8231 registers
+
+   The reset value for the input channel configuration is used (Reg 0x4A=0x07)
+   which sets the selected inputs marked with '*' below if multiple options are
+   possible:
+
+                    Voltage Mode          Temperature Mode
+        Sensor        Linux Id        Linux Id        VIA Id
+        --------      --------        --------        ------
+        CPU Diode       N/A             temp1           0
+        UIC1            in0             temp2 *         1
+        UIC2            in1 *           temp3           2
+        UIC3            in2 *           temp4           3
+        UIC4            in3 *           temp5           4
+        UIC5            in4 *           temp6           5
+        3.3V            in5             N/A
+
+   Note that the BIOS may set the configuration register to a different value
+   to match the motherboard configuration.
+*/
 
 /* fans numbered 0-1 */
 #define VT8231_REG_FAN_MIN(nr)  (0x3b + (nr))
@@ -83,14 +81,13 @@ static const u8 regvolt[]    = { 0x21, 0x22, 0x23, 0x24, 0x25, 0x26 };
 static const u8 regvoltmax[] = { 0x3d, 0x2b, 0x2d, 0x2f, 0x31, 0x33 };
 static const u8 regvoltmin[] = { 0x3e, 0x2c, 0x2e, 0x30, 0x32, 0x34 };
 
-/*
- * Temperatures are numbered 1-6 according to the Linux kernel specification.
- *
- * In the VIA datasheet, however, the temperatures are numbered from zero.
- * Since it is important that this driver can easily be compared to the VIA
- * datasheet, we will use the VIA numbering within this driver and map the
- * kernel sysfs device name to the VIA number in the sysfs callback.
- */
+/* Temperatures are numbered 1-6 according to the Linux kernel specification.
+**
+** In the VIA datasheet, however, the temperatures are numbered from zero.
+** Since it is important that this driver can easily be compared to the VIA
+** datasheet, we will use the VIA numbering within this driver and map the
+** kernel sysfs device name to the VIA number in the sysfs callback.
+*/
 
 #define VT8231_REG_TEMP_LOW01   0x49
 #define VT8231_REG_TEMP_LOW25   0x4d
@@ -111,10 +108,9 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 };
 #define VT8231_REG_TEMP1_CONFIG 0x4b
 #define VT8231_REG_TEMP2_CONFIG 0x4c
 
-/*
- * temps 0-5 as numbered in VIA datasheet - see later for mapping to Linux
- * numbering
- */
+/* temps 0-5 as numbered in VIA datasheet - see later for mapping to Linux
+** numbering
+*/
 #define ISTEMP(i, ch_config) ((i) == 0 ? 1 : \
                               ((ch_config) >> ((i)+1)) & 0x01)
 /* voltages 0-5 */
@@ -123,26 +119,24 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 };
 
 #define DIV_FROM_REG(val) (1 << (val))
 
-/*
- * NB  The values returned here are NOT temperatures.  The calibration curves
- *     for the thermistor curves are board-specific and must go in the
- *     sensors.conf file.  Temperature sensors are actually ten bits, but the
- *     VIA datasheet only considers the 8 MSBs obtained from the regtemp[]
- *     register.  The temperature value returned should have a magnitude of 3,
- *     so we use the VIA scaling as the "true" scaling and use the remaining 2
- *     LSBs as fractional precision.
- *
- *     All the on-chip hardware temperature comparisons for the alarms are only
- *     8-bits wide, and compare against the 8 MSBs of the temperature.  The bits
- *     in the registers VT8231_REG_TEMP_LOW01 and VT8231_REG_TEMP_LOW25 are
- *     ignored.
- */
-
-/*
- ****** FAN RPM CONVERSIONS ********
- * This chip saturates back at 0, not at 255 like many the other chips.
- * So, 0 means 0 RPM
- */
+/* NB  The values returned here are NOT temperatures.  The calibration curves
+**     for the thermistor curves are board-specific and must go in the
+**     sensors.conf file.  Temperature sensors are actually ten bits, but the
+**     VIA datasheet only considers the 8 MSBs obtained from the regtemp[]
+**     register.  The temperature value returned should have a magnitude of 3,
+**     so we use the VIA scaling as the "true" scaling and use the remaining 2
+**     LSBs as fractional precision.
+**
+**     All the on-chip hardware temperature comparisons for the alarms are only
+**     8-bits wide, and compare against the 8 MSBs of the temperature.  The bits
+**     in the registers VT8231_REG_TEMP_LOW01 and VT8231_REG_TEMP_LOW25 are
+**     ignored.
+*/
+
+/******** FAN RPM CONVERSIONS ********
+** This chip saturates back at 0, not at 255 like many the other chips.
+** So, 0 means 0 RPM
+*/
 static inline u8 FAN_TO_REG(long rpm, int div)
 {
         if (rpm == 0)
@@ -176,7 +170,7 @@ struct vt8231_data {
 
 static struct pci_dev *s_bridge;
 static int vt8231_probe(struct platform_device *pdev);
-static int vt8231_remove(struct platform_device *pdev);
+static int __devexit vt8231_remove(struct platform_device *pdev);
 static struct vt8231_data *vt8231_update_device(struct device *dev);
 static void vt8231_init_device(struct vt8231_data *data);
 
@@ -228,12 +222,7 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
         int nr = sensor_attr->index;
         struct vt8231_data *data = dev_get_drvdata(dev);
-        unsigned long val;
-        int err;
-
-        err = kstrtoul(buf, 10, &val);
-        if (err)
-                return err;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->in_min[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255);
@@ -248,12 +237,7 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
         int nr = sensor_attr->index;
         struct vt8231_data *data = dev_get_drvdata(dev);
-        unsigned long val;
-        int err;
-
-        err = kstrtoul(buf, 10, &val);
-        if (err)
-                return err;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->in_max[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255);
@@ -294,12 +278,7 @@ static ssize_t set_in5_min(struct device *dev, struct device_attribute *attr,
                 const char *buf, size_t count)
 {
         struct vt8231_data *data = dev_get_drvdata(dev);
-        unsigned long val;
-        int err;
-
-        err = kstrtoul(buf, 10, &val);
-        if (err)
-                return err;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->in_min[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3,
@@ -313,12 +292,7 @@ static ssize_t set_in5_max(struct device *dev, struct device_attribute *attr,
                 const char *buf, size_t count)
 {
         struct vt8231_data *data = dev_get_drvdata(dev);
-        unsigned long val;
-        int err;
-
-        err = kstrtoul(buf, 10, &val);
-        if (err)
-                return err;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->in_max[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3,
@@ -372,12 +346,7 @@ static ssize_t set_temp0_max(struct device *dev, struct device_attribute *attr,
                 const char *buf, size_t count)
 {
         struct vt8231_data *data = dev_get_drvdata(dev);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        int val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_max[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
@@ -389,12 +358,7 @@ static ssize_t set_temp0_min(struct device *dev, struct device_attribute *attr,
                 const char *buf, size_t count)
 {
         struct vt8231_data *data = dev_get_drvdata(dev);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        int val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_min[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
@@ -436,12 +400,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
         int nr = sensor_attr->index;
         struct vt8231_data *data = dev_get_drvdata(dev);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        int val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_max[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255);
@@ -455,12 +414,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
         int nr = sensor_attr->index;
         struct vt8231_data *data = dev_get_drvdata(dev);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        int val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->temp_min[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255);
@@ -469,10 +423,9 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
         return count;
 }
 
-/*
- * Note that these map the Linux temperature sensor numbering (1-6) to the VIA
- * temperature sensor numbering (0-5)
- */
+/* Note that these map the Linux temperature sensor numbering (1-6) to the VIA
+** temperature sensor numbering (0-5)
+*/
 #define define_temperature_sysfs(offset)                                \
 static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,                \
                 show_temp, NULL, offset - 1);                           \
@@ -483,8 +436,7 @@ static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR,	\
 
 static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp0, NULL);
 static DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp0_max, set_temp0_max);
-static DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp0_min,
-                   set_temp0_min);
+static DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp0_min, set_temp0_min);
 
 define_temperature_sysfs(2);
 define_temperature_sysfs(3);
@@ -528,12 +480,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
         int nr = sensor_attr->index;
         struct vt8231_data *data = dev_get_drvdata(dev);
-        unsigned long val;
-        int err;
-
-        err = kstrtoul(buf, 10, &val);
-        if (err)
-                return err;
+        int val = simple_strtoul(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
         data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
@@ -547,34 +494,21 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
 {
         struct vt8231_data *data = dev_get_drvdata(dev);
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
-        unsigned long val;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
         int nr = sensor_attr->index;
         int old = vt8231_read_value(data, VT8231_REG_FANDIV);
         long min = FAN_FROM_REG(data->fan_min[nr],
                                  DIV_FROM_REG(data->fan_div[nr]));
-        int err;
-
-        err = kstrtoul(buf, 10, &val);
-        if (err)
-                return err;
 
         mutex_lock(&data->update_lock);
         switch (val) {
-        case 1:
-                data->fan_div[nr] = 0;
-                break;
-        case 2:
-                data->fan_div[nr] = 1;
-                break;
-        case 4:
-                data->fan_div[nr] = 2;
-                break;
-        case 8:
-                data->fan_div[nr] = 3;
-                break;
+        case 1: data->fan_div[nr] = 0; break;
+        case 2: data->fan_div[nr] = 1; break;
+        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. "
-                        "Choose one of 1, 2, 4 or 8!\n", val);
+                        "Choose one of 1, 2, 4 or 8!\n", val);
                 mutex_unlock(&data->update_lock);
                 return -EINVAL;
         }
@@ -762,18 +696,18 @@ static struct platform_driver vt8231_driver = {
                 .name   = "vt8231",
         },
         .probe  = vt8231_probe,
-        .remove = vt8231_remove,
+        .remove = __devexit_p(vt8231_remove),
 };
 
-static DEFINE_PCI_DEVICE_TABLE(vt8231_pci_ids) = {
+static const struct pci_device_id vt8231_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) },
         { 0, }
 };
 
 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
 
-static int vt8231_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *id);
+static int __devinit vt8231_pci_probe(struct pci_dev *dev,
+                                      const struct pci_device_id *id);
 
 static struct pci_driver vt8231_pci_driver = {
         .name           = "vt8231",
@@ -789,16 +723,17 @@ static int vt8231_probe(struct platform_device *pdev)
 
         /* Reserve the ISA region */
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!devm_request_region(&pdev->dev, res->start, VT8231_EXTENT,
-                                 vt8231_driver.driver.name)) {
+        if (!request_region(res->start, VT8231_EXTENT,
+                            vt8231_driver.driver.name)) {
                 dev_err(&pdev->dev, "Region 0x%lx-0x%lx already in use!\n",
                         (unsigned long)res->start, (unsigned long)res->end);
                 return -ENODEV;
         }
 
-        data = devm_kzalloc(&pdev->dev, sizeof(struct vt8231_data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        if (!(data = kzalloc(sizeof(struct vt8231_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit_release;
+        }
 
         platform_set_drvdata(pdev, data);
         data->addr = res->start;
@@ -808,27 +743,24 @@ static int vt8231_probe(struct platform_device *pdev)
         vt8231_init_device(data);
 
         /* Register sysfs hooks */
-        err = sysfs_create_group(&pdev->dev.kobj, &vt8231_group);
-        if (err)
-                return err;
+        if ((err = sysfs_create_group(&pdev->dev.kobj, &vt8231_group)))
+                goto exit_free;
 
         /* Must update device information to find out the config field */
         data->uch_config = vt8231_read_value(data, VT8231_REG_UCH_CONFIG);
 
         for (i = 0; i < ARRAY_SIZE(vt8231_group_temps); i++) {
                 if (ISTEMP(i, data->uch_config)) {
-                        err = sysfs_create_group(&pdev->dev.kobj,
-                                                 &vt8231_group_temps[i]);
-                        if (err)
+                        if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                        &vt8231_group_temps[i])))
                                 goto exit_remove_files;
                 }
         }
 
         for (i = 0; i < ARRAY_SIZE(vt8231_group_volts); i++) {
                 if (ISVOLT(i, data->uch_config)) {
-                        err = sysfs_create_group(&pdev->dev.kobj,
-                                                 &vt8231_group_volts[i]);
-                        if (err)
+                        if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                        &vt8231_group_volts[i])))
                                 goto exit_remove_files;
                 }
         }
@@ -848,10 +780,17 @@ exit_remove_files:
                 sysfs_remove_group(&pdev->dev.kobj, &vt8231_group_temps[i]);
 
         sysfs_remove_group(&pdev->dev.kobj, &vt8231_group);
+
+exit_free:
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
+
+exit_release:
+        release_region(res->start, VT8231_EXTENT);
         return err;
 }
 
-static int vt8231_remove(struct platform_device *pdev)
+static int __devexit vt8231_remove(struct platform_device *pdev)
 {
         struct vt8231_data *data = platform_get_drvdata(pdev);
         int i;
@@ -866,6 +805,9 @@ static int vt8231_remove(struct platform_device *pdev)
 
         sysfs_remove_group(&pdev->dev.kobj, &vt8231_group);
 
+        release_region(data->addr, VT8231_EXTENT);
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
         return 0;
 }
 
@@ -924,15 +866,17 @@ static struct vt8231_data *vt8231_update_device(struct device *dev)
                         (vt8231_read_value(data, VT8231_REG_ALARM2) << 8);
 
                 /* Set alarm flags correctly */
-                if (!data->fan[0] && data->fan_min[0])
+                if (!data->fan[0] && data->fan_min[0]) {
                         data->alarms |= 0x40;
-                else if (data->fan[0] && !data->fan_min[0])
+                } else if (data->fan[0] && !data->fan_min[0]) {
                         data->alarms &= ~0x40;
+                }
 
-                if (!data->fan[1] && data->fan_min[1])
+                if (!data->fan[1] && data->fan_min[1]) {
                         data->alarms |= 0x80;
-                else if (data->fan[1] && !data->fan_min[1])
+                } else if (data->fan[1] && !data->fan_min[1]) {
                         data->alarms &= ~0x80;
+                }
 
                 data->last_updated = jiffies;
                 data->valid = 1;
@@ -943,7 +887,7 @@ static struct vt8231_data *vt8231_update_device(struct device *dev)
         return data;
 }
 
-static int vt8231_device_add(unsigned short address)
+static int __devinit vt8231_device_add(unsigned short address)
 {
         struct resource res = {
                 .start  = address,
@@ -984,7 +928,7 @@ exit:
         return err;
 }
 
-static int vt8231_pci_probe(struct pci_dev *dev,
+static int __devinit vt8231_pci_probe(struct pci_dev *dev,
                                 const struct pci_device_id *id)
 {
         u16 address, val;
@@ -1027,16 +971,13 @@ static int vt8231_pci_probe(struct pci_dev *dev,
         if (vt8231_device_add(address))
                 goto exit_unregister;
 
-        /*
-         * Always return failure here.  This is to allow other drivers to bind
+        /* Always return failure here.  This is to allow other drivers to bind
          * to this pci device.  We don't really want to have control over the
          * pci device, we only wanted to read as few register values from it.
          */
 
-        /*
-         * We do, however, mark ourselves as using the PCI device to stop it
-         * getting unloaded.
-         */
+        /* We do, however, mark ourselves as using the PCI device to stop it
+           getting unloaded. */
         s_bridge = pci_dev_get(dev);
         return -ENODEV;