Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (w83627hf) Fix for "No such device"
  hwmon: (sht15) Off-by-one error in array index + incorrect constants
  hwmon: Add driver for VIA CPU core temperature
  hwmon: (smsc47m1) Enable device if needed
  hwmon: (smsc47m1) Fail module loading on error
  hwmon: (smsc47m1) Only request I/O ports we really use
  hwmon: New driver for AMD Family 10h/11h CPUs

8 files changed, 766 insertions, 30 deletions

diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
new file mode 100644
index 000000000000..a7a18d453a51
--- /dev/null
+++ b/Documentation/hwmon/k10temp
@@ -0,0 +1,60 @@
+Kernel driver k10temp
+=====================
+
+Supported chips:
+* AMD Family 10h processors:
+  Socket F: Quad-Core/Six-Core/Embedded Opteron
+  Socket AM2+: Opteron, Phenom (II) X3/X4
+  Socket AM3: Quad-Core Opteron, Athlon/Phenom II X2/X3/X4, Sempron II
+  Socket S1G3: Athlon II, Sempron, Turion II
+* AMD Family 11h processors:
+  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)
+
+  Prefix: 'k10temp'
+  Addresses scanned: PCI space
+  Datasheets:
+  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 10h Processors:
+    http://support.amd.com/us/Processor_TechDocs/31116.pdf
+  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 11h Processors:
+    http://support.amd.com/us/Processor_TechDocs/41256.pdf
+  Revision Guide for AMD Family 10h Processors:
+    http://support.amd.com/us/Processor_TechDocs/41322.pdf
+  Revision Guide for AMD Family 11h Processors:
+    http://support.amd.com/us/Processor_TechDocs/41788.pdf
+  AMD Family 11h Processor Power and Thermal Data Sheet for Notebooks:
+    http://support.amd.com/us/Processor_TechDocs/43373.pdf
+  AMD Family 10h Server and Workstation Processor Power and Thermal Data Sheet:
+    http://support.amd.com/us/Processor_TechDocs/43374.pdf
+  AMD Family 10h Desktop Processor Power and Thermal Data Sheet:
+    http://support.amd.com/us/Processor_TechDocs/43375.pdf
+
+Author: Clemens Ladisch <clemens@ladisch.de>
+
+Description
+-----------
+
+This driver permits reading of the internal temperature sensor of AMD
+Family 10h and 11h processors.
+
+All these processors have a sensor, but on older revisions of Family 10h
+processors, the sensor may return inconsistent values (erratum 319). The
+driver will refuse to load on these revisions unless you specify the
+"force=1" module parameter.
+
+There is one temperature measurement value, available as temp1_input in
+sysfs. It is measured in degrees Celsius with a resolution of 1/8th degree.
+Please note that it is defined as a relative value; to quote the AMD manual:
+
+  Tctl is the processor temperature control value, used by the platform to
+  control cooling systems. Tctl is a non-physical temperature on an
+  arbitrary scale measured in degrees. It does _not_ represent an actual
+  physical temperature like die or case temperature. Instead, it specifies
+  the processor temperature relative to the point at which the system must
+  supply the maximum cooling for the processor's specified maximum case
+  temperature and maximum thermal power dissipation.
+
+The maximum value for Tctl is available in the file temp1_max.
+
+If the BIOS has enabled hardware temperature control, the threshold at
+which the processor will throttle itself to avoid damage is available in
+temp1_crit and temp1_crit_hyst.
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index bf28945c610d..46c3c566307e 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -228,6 +228,18 @@ config SENSORS_K8TEMP
           This driver can also be built as a module.  If so, the module
           will be called k8temp.
 
+config SENSORS_K10TEMP
+        tristate "AMD Phenom/Sempron/Turion/Opteron temperature sensor"
+        depends on X86 && PCI
+        help
+          If you say yes here you get support for the temperature
+          sensor(s) inside your CPU. Supported are later revisions of
+          the AMD Family 10h and all revisions of the AMD Family 11h
+          microarchitectures.
+
+          This driver can also be built as a module.  If so, the module
+          will be called k10temp.
+
 config SENSORS_AMS
         tristate "Apple Motion Sensor driver"
         depends on PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
@@ -810,6 +822,14 @@ config SENSORS_TMP421
           This driver can also be built as a module.  If so, the module
           will be called tmp421.
 
+config SENSORS_VIA_CPUTEMP
+        tristate "VIA CPU temperature sensor"
+        depends on X86
+        help
+          If you say yes here you get support for the temperature
+          sensor inside your CPU. Supported are all known variants of
+          the VIA C7 and Nano.
+
 config SENSORS_VIA686A
         tristate "VIA686A"
         depends on PCI
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 4131e253f96a..450c8e894277 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -53,6 +53,7 @@ obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.o
 obj-$(CONFIG_SENSORS_IBMPEX)    += ibmpex.o
 obj-$(CONFIG_SENSORS_IT87)      += it87.o
 obj-$(CONFIG_SENSORS_K8TEMP)    += k8temp.o
+obj-$(CONFIG_SENSORS_K10TEMP)   += k10temp.o
 obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
 obj-$(CONFIG_SENSORS_LIS3_SPI)  += lis3lv02d.o lis3lv02d_spi.o
 obj-$(CONFIG_SENSORS_LIS3_I2C)  += lis3lv02d.o lis3lv02d_i2c.o
@@ -88,6 +89,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
 obj-$(CONFIG_SENSORS_THMC50)    += thmc50.o
 obj-$(CONFIG_SENSORS_TMP401)    += tmp401.o
 obj-$(CONFIG_SENSORS_TMP421)    += tmp421.o
+obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o
 obj-$(CONFIG_SENSORS_VIA686A)   += via686a.o
 obj-$(CONFIG_SENSORS_VT1211)    += vt1211.o
 obj-$(CONFIG_SENSORS_VT8231)    += vt8231.o
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
new file mode 100644
index 000000000000..d8a26d16d948
--- /dev/null
+++ b/drivers/hwmon/k10temp.c
@@ -0,0 +1,197 @@
+/*
+ * k10temp.c - AMD Family 10h/11h processor hardware monitoring
+ *
+ * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ * This driver is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This driver 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 driver; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <asm/processor.h>
+
+MODULE_DESCRIPTION("AMD Family 10h/11h CPU core temperature monitor");
+MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
+MODULE_LICENSE("GPL");
+
+static bool force;
+module_param(force, bool, 0444);
+MODULE_PARM_DESC(force, "force loading on processors with erratum 319");
+
+#define REG_HARDWARE_THERMAL_CONTROL    0x64
+#define  HTC_ENABLE                     0x00000001
+
+#define REG_REPORTED_TEMPERATURE        0xa4
+
+#define REG_NORTHBRIDGE_CAPABILITIES    0xe8
+#define  NB_CAP_HTC                     0x00000400
+
+static ssize_t show_temp(struct device *dev,
+                         struct device_attribute *attr, char *buf)
+{
+        u32 regval;
+
+        pci_read_config_dword(to_pci_dev(dev),
+                              REG_REPORTED_TEMPERATURE, &regval);
+        return sprintf(buf, "%u\n", (regval >> 21) * 125);
+}
+
+static ssize_t show_temp_max(struct device *dev,
+                             struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%d\n", 70 * 1000);
+}
+
+static ssize_t show_temp_crit(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int show_hyst = attr->index;
+        u32 regval;
+        int value;
+
+        pci_read_config_dword(to_pci_dev(dev),
+                              REG_HARDWARE_THERMAL_CONTROL, &regval);
+        value = ((regval >> 16) & 0x7f) * 500 + 52000;
+        if (show_hyst)
+                value -= ((regval >> 24) & 0xf) * 500;
+        return sprintf(buf, "%d\n", value);
+}
+
+static ssize_t show_name(struct device *dev,
+                         struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "k10temp\n");
+}
+
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL);
+static DEVICE_ATTR(temp1_max, S_IRUGO, show_temp_max, NULL);
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, show_temp_crit, NULL, 1);
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+
+static bool __devinit has_erratum_319(void)
+{
+        /*
+         * Erratum 319: The thermal sensor of older Family 10h processors
+         *              (B steppings) may be unreliable.
+         */
+        return boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model <= 2;
+}
+
+static int __devinit k10temp_probe(struct pci_dev *pdev,
+                                   const struct pci_device_id *id)
+{
+        struct device *hwmon_dev;
+        u32 reg_caps, reg_htc;
+        int err;
+
+        if (has_erratum_319() && !force) {
+                dev_err(&pdev->dev,
+                        "unreliable CPU thermal sensor; monitoring disabled\n");
+                err = -ENODEV;
+                goto exit;
+        }
+
+        err = device_create_file(&pdev->dev, &dev_attr_temp1_input);
+        if (err)
+                goto exit;
+        err = device_create_file(&pdev->dev, &dev_attr_temp1_max);
+        if (err)
+                goto exit_remove;
+
+        pci_read_config_dword(pdev, REG_NORTHBRIDGE_CAPABILITIES, &reg_caps);
+        pci_read_config_dword(pdev, REG_HARDWARE_THERMAL_CONTROL, &reg_htc);
+        if ((reg_caps & NB_CAP_HTC) && (reg_htc & HTC_ENABLE)) {
+                err = device_create_file(&pdev->dev,
+                                &sensor_dev_attr_temp1_crit.dev_attr);
+                if (err)
+                        goto exit_remove;
+                err = device_create_file(&pdev->dev,
+                                &sensor_dev_attr_temp1_crit_hyst.dev_attr);
+                if (err)
+                        goto exit_remove;
+        }
+
+        err = device_create_file(&pdev->dev, &dev_attr_name);
+        if (err)
+                goto exit_remove;
+
+        hwmon_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(hwmon_dev)) {
+                err = PTR_ERR(hwmon_dev);
+                goto exit_remove;
+        }
+        dev_set_drvdata(&pdev->dev, hwmon_dev);
+
+        if (has_erratum_319() && force)
+                dev_warn(&pdev->dev,
+                         "unreliable CPU thermal sensor; check erratum 319\n");
+        return 0;
+
+exit_remove:
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        device_remove_file(&pdev->dev, &dev_attr_temp1_input);
+        device_remove_file(&pdev->dev, &dev_attr_temp1_max);
+        device_remove_file(&pdev->dev,
+                           &sensor_dev_attr_temp1_crit.dev_attr);
+        device_remove_file(&pdev->dev,
+                           &sensor_dev_attr_temp1_crit_hyst.dev_attr);
+exit:
+        return err;
+}
+
+static void __devexit k10temp_remove(struct pci_dev *pdev)
+{
+        hwmon_device_unregister(dev_get_drvdata(&pdev->dev));
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        device_remove_file(&pdev->dev, &dev_attr_temp1_input);
+        device_remove_file(&pdev->dev, &dev_attr_temp1_max);
+        device_remove_file(&pdev->dev,
+                           &sensor_dev_attr_temp1_crit.dev_attr);
+        device_remove_file(&pdev->dev,
+                           &sensor_dev_attr_temp1_crit_hyst.dev_attr);
+        dev_set_drvdata(&pdev->dev, NULL);
+}
+
+static struct pci_device_id k10temp_id_table[] = {
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },
+        {}
+};
+MODULE_DEVICE_TABLE(pci, k10temp_id_table);
+
+static struct pci_driver k10temp_driver = {
+        .name = "k10temp",
+        .id_table = k10temp_id_table,
+        .probe = k10temp_probe,
+        .remove = __devexit_p(k10temp_remove),
+};
+
+static int __init k10temp_init(void)
+{
+        return pci_register_driver(&k10temp_driver);
+}
+
+static void __exit k10temp_exit(void)
+{
+        pci_unregister_driver(&k10temp_driver);
+}
+
+module_init(k10temp_init)
+module_exit(k10temp_exit)
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index ebe38b680ee3..864a371f6eb9 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -305,7 +305,7 @@ static inline int sht15_calc_temp(struct sht15_data *data)
         int d1 = 0;
         int i;
 
-        for (i = 1; i < ARRAY_SIZE(temppoints) - 1; i++)
+        for (i = 1; i < ARRAY_SIZE(temppoints); i++)
                 /* Find pointer to interpolate */
                 if (data->supply_uV > temppoints[i - 1].vdd) {
                         d1 = (data->supply_uV/1000 - temppoints[i - 1].vdd)
@@ -332,12 +332,12 @@ static inline int sht15_calc_humid(struct sht15_data *data)
 
         const int c1 = -4;
         const int c2 = 40500; /* x 10 ^ -6 */
-        const int c3 = 2800; /* x10 ^ -9 */
+        const int c3 = -2800; /* x10 ^ -9 */
 
         RHlinear = c1*1000
                 + c2 * data->val_humid/1000
                 + (data->val_humid * data->val_humid * c3)/1000000;
-        return (temp - 25000) * (10000 + 800 * data->val_humid)
+        return (temp - 25000) * (10000 + 80 * data->val_humid)
                 / 1000000 + RHlinear;
 }
 
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 8ad50fdba00d..9ca97818bd4b 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -136,11 +136,11 @@ struct smsc47m1_data {
 
 struct smsc47m1_sio_data {
         enum chips type;
+        u8 activate;            /* Remember initial device state */
 };
 
 
-static int smsc47m1_probe(struct platform_device *pdev);
-static int __devexit smsc47m1_remove(struct platform_device *pdev);
+static int __exit smsc47m1_remove(struct platform_device *pdev);
 static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
                 int init);
 
@@ -160,8 +160,7 @@ static struct platform_driver smsc47m1_driver = {
                 .owner  = THIS_MODULE,
                 .name   = DRVNAME,
         },
-        .probe          = smsc47m1_probe,
-        .remove         = __devexit_p(smsc47m1_remove),
+        .remove         = __exit_p(smsc47m1_remove),
 };
 
 static ssize_t get_fan(struct device *dev, struct device_attribute
@@ -470,24 +469,126 @@ static int __init smsc47m1_find(unsigned short *addr,
         superio_select();
         *addr = (superio_inb(SUPERIO_REG_BASE) << 8)
               |  superio_inb(SUPERIO_REG_BASE + 1);
-        val = superio_inb(SUPERIO_REG_ACT);
-        if (*addr == 0 || (val & 0x01) == 0) {
-                pr_info(DRVNAME ": Device is disabled, will not use\n");
+        if (*addr == 0) {
+                pr_info(DRVNAME ": Device address not set, will not use\n");
                 superio_exit();
                 return -ENODEV;
         }
 
+        /* Enable only if address is set (needed at least on the
+         * Compaq Presario S4000NX) */
+        sio_data->activate = superio_inb(SUPERIO_REG_ACT);
+        if ((sio_data->activate & 0x01) == 0) {
+                pr_info(DRVNAME ": Enabling device\n");
+                superio_outb(SUPERIO_REG_ACT, sio_data->activate | 0x01);
+        }
+
         superio_exit();
         return 0;
 }
 
-static int __devinit smsc47m1_probe(struct platform_device *pdev)
+/* Restore device to its initial state */
+static void __init smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)
+{
+        if ((sio_data->activate & 0x01) == 0) {
+                superio_enter();
+                superio_select();
+
+                pr_info(DRVNAME ": Disabling device\n");
+                superio_outb(SUPERIO_REG_ACT, sio_data->activate);
+
+                superio_exit();
+        }
+}
+
+#define CHECK           1
+#define REQUEST         2
+#define RELEASE         3
+
+/*
+ * This function can be used to:
+ *  - test for resource conflicts with ACPI
+ *  - request the resources
+ *  - release the resources
+ * We only allocate the I/O ports we really need, to minimize the risk of
+ * conflicts with ACPI or with other drivers.
+ */
+static int smsc47m1_handle_resources(unsigned short address, enum chips type,
+                                     int action, struct device *dev)
+{
+        static const u8 ports_m1[] = {
+                /* register, region length */
+                0x04, 1,
+                0x33, 4,
+                0x56, 7,
+        };
+
+        static const u8 ports_m2[] = {
+                /* register, region length */
+                0x04, 1,
+                0x09, 1,
+                0x2c, 2,
+                0x35, 4,
+                0x56, 7,
+                0x69, 4,
+        };
+
+        int i, ports_size, err;
+        const u8 *ports;
+
+        switch (type) {
+        case smsc47m1:
+        default:
+                ports = ports_m1;
+                ports_size = ARRAY_SIZE(ports_m1);
+                break;
+        case smsc47m2:
+                ports = ports_m2;
+                ports_size = ARRAY_SIZE(ports_m2);
+                break;
+        }
+
+        for (i = 0; i + 1 < ports_size; i += 2) {
+                unsigned short start = address + ports[i];
+                unsigned short len = ports[i + 1];
+
+                switch (action) {
+                case CHECK:
+                        /* Only check for conflicts */
+                        err = acpi_check_region(start, len, DRVNAME);
+                        if (err)
+                                return err;
+                        break;
+                case REQUEST:
+                        /* Request the resources */
+                        if (!request_region(start, len, DRVNAME)) {
+                                dev_err(dev, "Region 0x%hx-0x%hx already in "
+                                        "use!\n", start, start + len);
+
+                                /* Undo all requests */
+                                for (i -= 2; i >= 0; i -= 2)
+                                        release_region(address + ports[i],
+                                                       ports[i + 1]);
+                                return -EBUSY;
+                        }
+                        break;
+                case RELEASE:
+                        /* Release the resources */
+                        release_region(start, len);
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+static int __init smsc47m1_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct smsc47m1_sio_data *sio_data = dev->platform_data;
         struct smsc47m1_data *data;
         struct resource *res;
-        int err = 0;
+        int err;
         int fan1, fan2, fan3, pwm1, pwm2, pwm3;
 
         static const char *names[] = {
@@ -496,12 +597,10 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
         };
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!request_region(res->start, SMSC_EXTENT, DRVNAME)) {
-                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
-                        (unsigned long)res->start,
-                        (unsigned long)res->end);
-                return -EBUSY;
-        }
+        err = smsc47m1_handle_resources(res->start, sio_data->type,
+                                        REQUEST, dev);
+        if (err < 0)
+                return err;
 
         if (!(data = kzalloc(sizeof(struct smsc47m1_data), GFP_KERNEL))) {
                 err = -ENOMEM;
@@ -637,11 +736,11 @@ error_free:
         platform_set_drvdata(pdev, NULL);
         kfree(data);
 error_release:
-        release_region(res->start, SMSC_EXTENT);
+        smsc47m1_handle_resources(res->start, sio_data->type, RELEASE, dev);
         return err;
 }
 
-static int __devexit smsc47m1_remove(struct platform_device *pdev)
+static int __exit smsc47m1_remove(struct platform_device *pdev)
 {
         struct smsc47m1_data *data = platform_get_drvdata(pdev);
         struct resource *res;
@@ -650,7 +749,7 @@ static int __devexit smsc47m1_remove(struct platform_device *pdev)
         sysfs_remove_group(&pdev->dev.kobj, &smsc47m1_group);
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        release_region(res->start, SMSC_EXTENT);
+        smsc47m1_handle_resources(res->start, data->type, RELEASE, &pdev->dev);
         platform_set_drvdata(pdev, NULL);
         kfree(data);
 
@@ -717,7 +816,7 @@ static int __init smsc47m1_device_add(unsigned short address,
         };
         int err;
 
-        err = acpi_check_resource_conflict(&res);
+        err = smsc47m1_handle_resources(address, sio_data->type, CHECK, NULL);
         if (err)
                 goto exit;
 
@@ -766,27 +865,29 @@ static int __init sm_smsc47m1_init(void)
         if (smsc47m1_find(&address, &sio_data))
                 return -ENODEV;
 
-        err = platform_driver_register(&smsc47m1_driver);
+        /* Sets global pdev as a side effect */
+        err = smsc47m1_device_add(address, &sio_data);
         if (err)
                 goto exit;
 
-        /* Sets global pdev as a side effect */
-        err = smsc47m1_device_add(address, &sio_data);
+        err = platform_driver_probe(&smsc47m1_driver, smsc47m1_probe);
         if (err)
-                goto exit_driver;
+                goto exit_device;
 
         return 0;
 
-exit_driver:
-        platform_driver_unregister(&smsc47m1_driver);
+exit_device:
+        platform_device_unregister(pdev);
+        smsc47m1_restore(&sio_data);
 exit:
         return err;
 }
 
 static void __exit sm_smsc47m1_exit(void)
 {
-        platform_device_unregister(pdev);
         platform_driver_unregister(&smsc47m1_driver);
+        smsc47m1_restore(pdev->dev.platform_data);
+        platform_device_unregister(pdev);
 }
 
 MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>");
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
new file mode 100644
index 000000000000..7442cf754856
--- /dev/null
+++ b/drivers/hwmon/via-cputemp.c
@@ -0,0 +1,356 @@
+/*
+ * via-cputemp.c - Driver for VIA CPU core temperature monitoring
+ * Copyright (C) 2009 VIA Technologies, Inc.
+ *
+ * based on existing coretemp.c, which is
+ *
+ * Copyright (C) 2007 Rudolf Marek <r.marek@assembler.cz>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/hwmon.h>
+#include <linux/sysfs.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/list.h>
+#include <linux/platform_device.h>
+#include <linux/cpu.h>
+#include <asm/msr.h>
+#include <asm/processor.h>
+
+#define DRVNAME "via_cputemp"
+
+enum { SHOW_TEMP, SHOW_LABEL, SHOW_NAME } SHOW;
+
+/*
+ * Functions declaration
+ */
+
+struct via_cputemp_data {
+        struct device *hwmon_dev;
+        const char *name;
+        u32 id;
+        u32 msr;
+};
+
+/*
+ * Sysfs stuff
+ */
+
+static ssize_t show_name(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
+{
+        int ret;
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct via_cputemp_data *data = dev_get_drvdata(dev);
+
+        if (attr->index == SHOW_NAME)
+                ret = sprintf(buf, "%s\n", data->name);
+        else    /* show label */
+                ret = sprintf(buf, "Core %d\n", data->id);
+        return ret;
+}
+
+static ssize_t show_temp(struct device *dev,
+                         struct device_attribute *devattr, char *buf)
+{
+        struct via_cputemp_data *data = dev_get_drvdata(dev);
+        u32 eax, edx;
+        int err;
+
+        err = rdmsr_safe_on_cpu(data->id, data->msr, &eax, &edx);
+        if (err)
+                return -EAGAIN;
+
+        return sprintf(buf, "%lu\n", ((unsigned long)eax & 0xffffff) * 1000);
+}
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL,
+                          SHOW_TEMP);
+static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_name, NULL, SHOW_LABEL);
+static SENSOR_DEVICE_ATTR(name, S_IRUGO, show_name, NULL, SHOW_NAME);
+
+static struct attribute *via_cputemp_attributes[] = {
+        &sensor_dev_attr_name.dev_attr.attr,
+        &sensor_dev_attr_temp1_label.dev_attr.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group via_cputemp_group = {
+        .attrs = via_cputemp_attributes,
+};
+
+static int __devinit via_cputemp_probe(struct platform_device *pdev)
+{
+        struct via_cputemp_data *data;
+        struct cpuinfo_x86 *c = &cpu_data(pdev->id);
+        int err;
+        u32 eax, edx;
+
+        data = kzalloc(sizeof(struct via_cputemp_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                dev_err(&pdev->dev, "Out of memory\n");
+                goto exit;
+        }
+
+        data->id = pdev->id;
+        data->name = "via_cputemp";
+
+        switch (c->x86_model) {
+        case 0xA:
+                /* C7 A */
+        case 0xD:
+                /* C7 D */
+                data->msr = 0x1169;
+                break;
+        case 0xF:
+                /* Nano */
+                data->msr = 0x1423;
+                break;
+        default:
+                err = -ENODEV;
+                goto exit_free;
+        }
+
+        /* test if we can access the TEMPERATURE MSR */
+        err = rdmsr_safe_on_cpu(data->id, data->msr, &eax, &edx);
+        if (err) {
+                dev_err(&pdev->dev,
+                        "Unable to access TEMPERATURE MSR, giving up\n");
+                goto exit_free;
+        }
+
+        platform_set_drvdata(pdev, data);
+
+        err = sysfs_create_group(&pdev->dev.kobj, &via_cputemp_group);
+        if (err)
+                goto exit_free;
+
+        data->hwmon_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
+                dev_err(&pdev->dev, "Class registration failed (%d)\n",
+                        err);
+                goto exit_remove;
+        }
+
+        return 0;
+
+exit_remove:
+        sysfs_remove_group(&pdev->dev.kobj, &via_cputemp_group);
+exit_free:
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
+exit:
+        return err;
+}
+
+static int __devexit via_cputemp_remove(struct platform_device *pdev)
+{
+        struct via_cputemp_data *data = platform_get_drvdata(pdev);
+
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&pdev->dev.kobj, &via_cputemp_group);
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
+        return 0;
+}
+
+static struct platform_driver via_cputemp_driver = {
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = DRVNAME,
+        },
+        .probe = via_cputemp_probe,
+        .remove = __devexit_p(via_cputemp_remove),
+};
+
+struct pdev_entry {
+        struct list_head list;
+        struct platform_device *pdev;
+        unsigned int cpu;
+};
+
+static LIST_HEAD(pdev_list);
+static DEFINE_MUTEX(pdev_list_mutex);
+
+static int __cpuinit via_cputemp_device_add(unsigned int cpu)
+{
+        int err;
+        struct platform_device *pdev;
+        struct pdev_entry *pdev_entry;
+
+        pdev = platform_device_alloc(DRVNAME, cpu);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+                goto exit;
+        }
+
+        pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL);
+        if (!pdev_entry) {
+                err = -ENOMEM;
+                goto exit_device_put;
+        }
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+                       err);
+                goto exit_device_free;
+        }
+
+        pdev_entry->pdev = pdev;
+        pdev_entry->cpu = cpu;
+        mutex_lock(&pdev_list_mutex);
+        list_add_tail(&pdev_entry->list, &pdev_list);
+        mutex_unlock(&pdev_list_mutex);
+
+        return 0;
+
+exit_device_free:
+        kfree(pdev_entry);
+exit_device_put:
+        platform_device_put(pdev);
+exit:
+        return err;
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+static void via_cputemp_device_remove(unsigned int cpu)
+{
+        struct pdev_entry *p, *n;
+        mutex_lock(&pdev_list_mutex);
+        list_for_each_entry_safe(p, n, &pdev_list, list) {
+                if (p->cpu == cpu) {
+                        platform_device_unregister(p->pdev);
+                        list_del(&p->list);
+                        kfree(p);
+                }
+        }
+        mutex_unlock(&pdev_list_mutex);
+}
+
+static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
+                                 unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (unsigned long) hcpu;
+
+        switch (action) {
+        case CPU_ONLINE:
+        case CPU_DOWN_FAILED:
+                via_cputemp_device_add(cpu);
+                break;
+        case CPU_DOWN_PREPARE:
+                via_cputemp_device_remove(cpu);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block via_cputemp_cpu_notifier __refdata = {
+        .notifier_call = via_cputemp_cpu_callback,
+};
+#endif                          /* !CONFIG_HOTPLUG_CPU */
+
+static int __init via_cputemp_init(void)
+{
+        int i, err;
+        struct pdev_entry *p, *n;
+
+        if (cpu_data(0).x86_vendor != X86_VENDOR_CENTAUR) {
+                printk(KERN_DEBUG DRVNAME ": Not a VIA CPU\n");
+                err = -ENODEV;
+                goto exit;
+        }
+
+        err = platform_driver_register(&via_cputemp_driver);
+        if (err)
+                goto exit;
+
+        for_each_online_cpu(i) {
+                struct cpuinfo_x86 *c = &cpu_data(i);
+
+                if (c->x86 != 6)
+                        continue;
+
+                if (c->x86_model < 0x0a)
+                        continue;
+
+                if (c->x86_model > 0x0f) {
+                        printk(KERN_WARNING DRVNAME ": Unknown CPU "
+                                "model 0x%x\n", c->x86_model);
+                        continue;
+                }
+
+                err = via_cputemp_device_add(i);
+                if (err)
+                        goto exit_devices_unreg;
+        }
+        if (list_empty(&pdev_list)) {
+                err = -ENODEV;
+                goto exit_driver_unreg;
+        }
+
+#ifdef CONFIG_HOTPLUG_CPU
+        register_hotcpu_notifier(&via_cputemp_cpu_notifier);
+#endif
+        return 0;
+
+exit_devices_unreg:
+        mutex_lock(&pdev_list_mutex);
+        list_for_each_entry_safe(p, n, &pdev_list, list) {
+                platform_device_unregister(p->pdev);
+                list_del(&p->list);
+                kfree(p);
+        }
+        mutex_unlock(&pdev_list_mutex);
+exit_driver_unreg:
+        platform_driver_unregister(&via_cputemp_driver);
+exit:
+        return err;
+}
+
+static void __exit via_cputemp_exit(void)
+{
+        struct pdev_entry *p, *n;
+#ifdef CONFIG_HOTPLUG_CPU
+        unregister_hotcpu_notifier(&via_cputemp_cpu_notifier);
+#endif
+        mutex_lock(&pdev_list_mutex);
+        list_for_each_entry_safe(p, n, &pdev_list, list) {
+                platform_device_unregister(p->pdev);
+                list_del(&p->list);
+                kfree(p);
+        }
+        mutex_unlock(&pdev_list_mutex);
+        platform_driver_unregister(&via_cputemp_driver);
+}
+
+MODULE_AUTHOR("Harald Welte <HaraldWelte@viatech.com>");
+MODULE_DESCRIPTION("VIA CPU temperature monitor");
+MODULE_LICENSE("GPL");
+
+module_init(via_cputemp_init)
+module_exit(via_cputemp_exit)
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index b257c7223733..38e280523071 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -1135,6 +1135,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
                 "W83687THF",
         };
 
+        sio_data->sioaddr = sioaddr;
         superio_enter(sio_data);
         val = force_id ? force_id : superio_inb(sio_data, DEVID);
         switch (val) {
@@ -1177,7 +1178,6 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
         }
 
         err = 0;
-        sio_data->sioaddr = sioaddr;
         pr_info(DRVNAME ": Found %s chip at %#x\n",
                 names[sio_data->type], *addr);