1 files changed, 105 insertions, 7 deletions

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 1821b7423d5b..0e8ffd6059a0 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1,7 +1,7 @@
 /*
  *  w83627ehf - Driver for the hardware monitoring functionality of
  *              the Winbond W83627EHF Super-I/O chip
- *  Copyright (C) 2005-2011  Jean Delvare <khali@linux-fr.org>
+ *  Copyright (C) 2005-2012  Jean Delvare <khali@linux-fr.org>
  *  Copyright (C) 2006  Yuan Mu (Winbond),
  *                      Rudolf Marek <r.marek@assembler.cz>
  *                      David Hubbard <david.c.hubbard@gmail.com>
@@ -502,6 +502,13 @@ struct w83627ehf_data {
         u16 have_temp_offset;
         u8 in6_skip:1;
         u8 temp3_val_only:1;
+
+#ifdef CONFIG_PM
+        /* Remember extra register values over suspend/resume */
+        u8 vbat;
+        u8 fandiv1;
+        u8 fandiv2;
+#endif
 };
 
 struct w83627ehf_sio_data {
@@ -898,6 +905,8 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
                                 data->temp_max_hyst[i]
                                   = w83627ehf_read_temp(data,
                                                 data->reg_temp_hyst[i]);
+                        if (i > 2)
+                                continue;
                         if (data->have_temp_offset & (1 << i))
                                 data->temp_offset[i]
                                   = w83627ehf_read_value(data,
@@ -1866,7 +1875,7 @@ static void w83627ehf_device_remove_files(struct device *dev)
 }
 
 /* Get the monitoring functions started */
-static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data,
+static inline void w83627ehf_init_device(struct w83627ehf_data *data,
                                                    enum kinds kind)
 {
         int i;
@@ -1952,7 +1961,7 @@ static void w82627ehf_swap_tempreg(struct w83627ehf_data *data,
         data->reg_temp_config[r2] = tmp;
 }
 
-static void __devinit
+static void
 w83627ehf_set_temp_reg_ehf(struct w83627ehf_data *data, int n_temp)
 {
         int i;
@@ -1965,7 +1974,7 @@ w83627ehf_set_temp_reg_ehf(struct w83627ehf_data *data, int n_temp)
         }
 }
 
-static void __devinit
+static void
 w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
                            struct w83627ehf_data *data)
 {
@@ -2054,7 +2063,7 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
         }
 }
 
-static int __devinit w83627ehf_probe(struct platform_device *pdev)
+static int w83627ehf_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct w83627ehf_sio_data *sio_data = dev->platform_data;
@@ -2083,6 +2092,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
         mutex_init(&data->lock);
         mutex_init(&data->update_lock);
         data->name = w83627ehf_device_names[sio_data->kind];
+        data->bank = 0xff;              /* Force initial bank selection */
         platform_set_drvdata(pdev, data);
 
         /* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */
@@ -2595,7 +2605,7 @@ exit:
         return err;
 }
 
-static int __devexit w83627ehf_remove(struct platform_device *pdev)
+static int w83627ehf_remove(struct platform_device *pdev)
 {
         struct w83627ehf_data *data = platform_get_drvdata(pdev);
 
@@ -2607,13 +2617,101 @@ static int __devexit w83627ehf_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int w83627ehf_suspend(struct device *dev)
+{
+        struct w83627ehf_data *data = w83627ehf_update_device(dev);
+        struct w83627ehf_sio_data *sio_data = dev->platform_data;
+
+        mutex_lock(&data->update_lock);
+        data->vbat = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
+        if (sio_data->kind == nct6775) {
+                data->fandiv1 = w83627ehf_read_value(data, NCT6775_REG_FANDIV1);
+                data->fandiv2 = w83627ehf_read_value(data, NCT6775_REG_FANDIV2);
+        }
+        mutex_unlock(&data->update_lock);
+
+        return 0;
+}
+
+static int w83627ehf_resume(struct device *dev)
+{
+        struct w83627ehf_data *data = dev_get_drvdata(dev);
+        struct w83627ehf_sio_data *sio_data = dev->platform_data;
+        int i;
+
+        mutex_lock(&data->update_lock);
+        data->bank = 0xff;              /* Force initial bank selection */
+
+        /* Restore limits */
+        for (i = 0; i < data->in_num; i++) {
+                if ((i == 6) && data->in6_skip)
+                        continue;
+
+                w83627ehf_write_value(data, W83627EHF_REG_IN_MIN(i),
+                                      data->in_min[i]);
+                w83627ehf_write_value(data, W83627EHF_REG_IN_MAX(i),
+                                      data->in_max[i]);
+        }
+
+        for (i = 0; i < 5; i++) {
+                if (!(data->has_fan_min & (1 << i)))
+                        continue;
+
+                w83627ehf_write_value(data, data->REG_FAN_MIN[i],
+                                      data->fan_min[i]);
+        }
+
+        for (i = 0; i < NUM_REG_TEMP; i++) {
+                if (!(data->have_temp & (1 << i)))
+                        continue;
+
+                if (data->reg_temp_over[i])
+                        w83627ehf_write_temp(data, data->reg_temp_over[i],
+                                             data->temp_max[i]);
+                if (data->reg_temp_hyst[i])
+                        w83627ehf_write_temp(data, data->reg_temp_hyst[i],
+                                             data->temp_max_hyst[i]);
+                if (i > 2)
+                        continue;
+                if (data->have_temp_offset & (1 << i))
+                        w83627ehf_write_value(data,
+                                              W83627EHF_REG_TEMP_OFFSET[i],
+                                              data->temp_offset[i]);
+        }
+
+        /* Restore other settings */
+        w83627ehf_write_value(data, W83627EHF_REG_VBAT, data->vbat);
+        if (sio_data->kind == nct6775) {
+                w83627ehf_write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
+                w83627ehf_write_value(data, NCT6775_REG_FANDIV2, data->fandiv2);
+        }
+
+        /* Force re-reading all values */
+        data->valid = 0;
+        mutex_unlock(&data->update_lock);
+
+        return 0;
+}
+
+static const struct dev_pm_ops w83627ehf_dev_pm_ops = {
+        .suspend = w83627ehf_suspend,
+        .resume = w83627ehf_resume,
+};
+
+#define W83627EHF_DEV_PM_OPS    (&w83627ehf_dev_pm_ops)
+#else
+#define W83627EHF_DEV_PM_OPS    NULL
+#endif /* CONFIG_PM */
+
 static struct platform_driver w83627ehf_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = DRVNAME,
+                .pm     = W83627EHF_DEV_PM_OPS,
         },
         .probe          = w83627ehf_probe,
-        .remove         = __devexit_p(w83627ehf_remove),
+        .remove         = w83627ehf_remove,
 };
 
 /* w83627ehf_find() looks for a '627 in the Super-I/O config space */