misc: Removed warnings from MAX1749 driver
[linux-2.6.git] / drivers / misc / nct1008.c
index 86f4030..d8e8e6b 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Driver for NCT1008, temperature monitoring device from ON Semiconductors
  *
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved.
  *
  * 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
 #include <linux/device.h>
 #include <linux/nct1008.h>
 #include <linux/delay.h>
+#include <linux/thermal.h>
 #include <linux/regulator/consumer.h>
 
-#define DRIVER_NAME "nct1008"
-
 /* Register Addresses */
 #define LOCAL_TEMP_RD                  0x00
 #define EXT_TEMP_RD_HI                 0x01
@@ -45,6 +44,7 @@
 #define LOCAL_TEMP_LO_LIMIT_RD         0x06
 
 #define EXT_TEMP_HI_LIMIT_HI_BYTE_RD   0x07
+#define EXT_TEMP_LO_LIMIT_HI_BYTE_RD   0x08
 
 #define CONFIG_WR                      0x09
 #define CONV_RATE_WR                   0x0A
@@ -52,6 +52,7 @@
 #define LOCAL_TEMP_LO_LIMIT_WR         0x0C
 #define EXT_TEMP_HI_LIMIT_HI_BYTE_WR   0x0D
 #define EXT_TEMP_LO_LIMIT_HI_BYTE_WR   0x0E
+#define ONE_SHOT                       0x0F
 #define OFFSET_WR                      0x11
 #define OFFSET_QUARTER_WR              0x12
 #define EXT_THERM_LIMIT_WR             0x19
 #define STANDBY_BIT                    BIT(6)
 #define ALERT_BIT                      BIT(7)
 
-/* Status register bits */
-#define STATUS_BUSY                    BIT(7)
-
-/* Worst-case wait when nct1008 is busy */
-#define BUSY_TIMEOUT_MSEC              1000
-
 /* Max Temperature Measurements */
 #define EXTENDED_RANGE_OFFSET          64U
 #define STANDARD_RANGE_MAX             127U
 
 #define MAX_STR_PRINT 50
 
-#define MIN_SLEEP_MSEC                 20
+#define MAX_CONV_TIME_ONESHOT_MS (52)
 #define CELSIUS_TO_MILLICELSIUS(x) ((x)*1000)
 #define MILLICELSIUS_TO_CELSIUS(x) ((x)/1000)
 
-static inline s8 value_to_temperature(bool extended, u8 value)
+#define POWER_ON_DELAY 20 /*ms*/
+
+struct nct1008_data {
+       struct workqueue_struct *workqueue;
+       struct work_struct work;
+       struct i2c_client *client;
+       struct nct1008_platform_data plat_data;
+       struct mutex mutex;
+       struct dentry *dent;
+       u8 config;
+       enum nct1008_chip chip;
+       struct regulator *nct_reg;
+       long current_lo_limit;
+       long current_hi_limit;
+       int conv_period_ms;
+       long etemp;
+       int shutdown_complete;
+
+       struct thermal_zone_device *nct_int;
+       struct thermal_zone_device *nct_ext;
+};
+
+static const struct i2c_device_id nct1008_id[] = {
+       { "nct1008", NCT1008 },
+       { "nct72", NCT72},
+       { "nct218", NCT218 },
+       {}
+};
+
+static int conv_period_ms_table[] =
+       {16000, 8000, 4000, 2000, 1000, 500, 250, 125, 63, 32, 16};
+
+static inline s16 value_to_temperature(bool extended, u8 value)
 {
-       return extended ? (s8)(value - EXTENDED_RANGE_OFFSET) : (s8)value;
+       return extended ? (s16)(value - EXTENDED_RANGE_OFFSET) : (s16)value;
 }
 
-static inline u8 temperature_to_value(bool extended, s8 temp)
+static inline u8 temperature_to_value(bool extended, s16 temp)
 {
        return extended ? (u8)(temp + EXTENDED_RANGE_OFFSET) : (u8)temp;
 }
 
-/* Wait with timeout if busy */
-static int nct1008_wait_till_busy(struct i2c_client *client)
+static int nct1008_write_reg(struct i2c_client *client, u8 reg, u16 value)
 {
-       int intr_status;
-       int msec_left = BUSY_TIMEOUT_MSEC;
-       bool is_busy;
+       int ret = 0;
+       struct nct1008_data *data = i2c_get_clientdata(client);
+
+       mutex_lock(&data->mutex);
+       if (data && data->shutdown_complete) {
+               mutex_unlock(&data->mutex);
+               return -ENODEV;
+       }
 
-       do {
-               intr_status = i2c_smbus_read_byte_data(client, STATUS_RD);
+       ret = i2c_smbus_write_byte_data(client, reg, value);
+       mutex_unlock(&data->mutex);
 
-               if (intr_status < 0) {
-                       dev_err(&client->dev, "%s, line=%d, i2c read error=%d\n"
-                               , __func__, __LINE__, intr_status);
-                       return intr_status;
-               }
+       if (ret < 0)
+               dev_err(&client->dev, "%s: err %d\n", __func__, ret);
 
-               /* check for busy bit */
-               is_busy = (intr_status & STATUS_BUSY) ? true : false;
-               if (is_busy) {
-                       /* fastest nct1008 conversion rate ~15msec */
-                       /* using 20msec since msleep below 20 is not
-                        * guaranteed to complete in specified duration */
-                       msleep(MIN_SLEEP_MSEC);
-                       msec_left -= MIN_SLEEP_MSEC;
-               }
-       } while ((is_busy) && (msec_left > 0));
+       return ret;
+}
 
-       if (msec_left <= 0) {
-               dev_err(&client->dev, "error: nct1008 busy timed out\n");
-               return -ETIMEDOUT;
+static int nct1008_read_reg(struct i2c_client *client, u8 reg)
+{
+       int ret = 0;
+       struct nct1008_data *data = i2c_get_clientdata(client);
+       mutex_lock(&data->mutex);
+       if (data && data->shutdown_complete) {
+               mutex_unlock(&data->mutex);
+               return -ENODEV;
        }
 
-       return 0;
+       ret = i2c_smbus_read_byte_data(client, reg);
+       mutex_unlock(&data->mutex);
+
+       if (ret < 0)
+               dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+
+       return ret;
 }
 
-static int nct1008_get_temp(struct device *dev, long *pTemp)
+static int nct1008_get_temp(struct device *dev, long *etemp, long *itemp)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct nct1008_platform_data *pdata = client->dev.platform_data;
-       s8 temp_local;
+       s16 temp_local;
        u8 temp_ext_lo;
-       s8 temp_ext_hi;
+       s16 temp_ext_hi;
        long temp_ext_milli;
        long temp_local_milli;
        u8 value;
 
-       value = nct1008_wait_till_busy(client);
-       if (value < 0)
-               goto error;
-
        /* Read Local Temp */
-       value = i2c_smbus_read_byte_data(client, LOCAL_TEMP_RD);
-       if (value < 0)
-               goto error;
-       temp_local = value_to_temperature(pdata->ext_range, value);
-       temp_local_milli = CELSIUS_TO_MILLICELSIUS(temp_local);
+       if (itemp) {
+               value = nct1008_read_reg(client, LOCAL_TEMP_RD);
+               if (value < 0)
+                       goto error;
+               temp_local = value_to_temperature(pdata->ext_range, value);
+               temp_local_milli = CELSIUS_TO_MILLICELSIUS(temp_local);
+
+               *itemp = temp_local_milli;
+       }
 
        /* Read External Temp */
-       value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO);
-       if (value < 0)
-               goto error;
-       temp_ext_lo = (value >> 6);
+       if (etemp) {
+               value = nct1008_read_reg(client, EXT_TEMP_RD_LO);
+               if (value < 0)
+                       goto error;
+               temp_ext_lo = (value >> 6);
 
-       value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_HI);
-       if (value < 0)
-               goto error;
-       temp_ext_hi = value_to_temperature(pdata->ext_range, value);
+               value = nct1008_read_reg(client, EXT_TEMP_RD_HI);
+               if (value < 0)
+                       goto error;
+               temp_ext_hi = value_to_temperature(pdata->ext_range, value);
 
-       temp_ext_milli = CELSIUS_TO_MILLICELSIUS(temp_ext_hi) +
-                               temp_ext_lo * 250;
+               temp_ext_milli = CELSIUS_TO_MILLICELSIUS(temp_ext_hi) +
+                                       temp_ext_lo * 250;
 
-       /* Return max between Local and External Temp */
-       *pTemp = max(temp_local_milli, temp_ext_milli);
+               *etemp = temp_ext_milli;
+       }
 
-       dev_dbg(dev, "\n %s: ret temp=%ldC ", __func__, *pTemp);
        return 0;
 error:
        dev_err(&client->dev, "\n error in file=: %s %s() line=%d: "
@@ -181,28 +212,24 @@ static ssize_t nct1008_show_temp(struct device *dev,
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct nct1008_platform_data *pdata = client->dev.platform_data;
-       s8 temp1 = 0;
-       s8 temp = 0;
+       s16 temp1 = 0;
+       s16 temp = 0;
        u8 temp2 = 0;
        int value = 0;
 
        if (!dev || !buf || !attr)
                return -EINVAL;
 
-       value = nct1008_wait_till_busy(client);
-       if (value < 0)
-               goto error;
-
-       value = i2c_smbus_read_byte_data(client, LOCAL_TEMP_RD);
+       value = nct1008_read_reg(client, LOCAL_TEMP_RD);
        if (value < 0)
                goto error;
        temp1 = value_to_temperature(pdata->ext_range, value);
 
-       value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO);
+       value = nct1008_read_reg(client, EXT_TEMP_RD_LO);
        if (value < 0)
                goto error;
        temp2 = (value >> 6);
-       value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_HI);
+       value = nct1008_read_reg(client, EXT_TEMP_RD_HI);
        if (value < 0)
                goto error;
        temp = value_to_temperature(pdata->ext_range, value);
@@ -222,16 +249,16 @@ static ssize_t nct1008_show_temp_overheat(struct device *dev,
        struct i2c_client *client = to_i2c_client(dev);
        struct nct1008_platform_data *pdata = client->dev.platform_data;
        int value;
-       s8 temp, temp2;
+       s16 temp, temp2;
 
        /* Local temperature h/w shutdown limit */
-       value = i2c_smbus_read_byte_data(client, LOCAL_THERM_LIMIT_WR);
+       value = nct1008_read_reg(client, LOCAL_THERM_LIMIT_WR);
        if (value < 0)
                goto error;
        temp = value_to_temperature(pdata->ext_range, value);
 
        /* External temperature h/w shutdown limit */
-       value = i2c_smbus_read_byte_data(client, EXT_THERM_LIMIT_WR);
+       value = nct1008_read_reg(client, EXT_THERM_LIMIT_WR);
        if (value < 0)
                goto error;
        temp2 = value_to_temperature(pdata->ext_range, value);
@@ -268,7 +295,7 @@ static ssize_t nct1008_set_temp_overheat(struct device *dev,
                return -EINVAL;
        }
        /* check for system power down */
-       err = nct1008_get_temp(dev, &currTemp);
+       err = nct1008_get_temp(dev, &currTemp, NULL);
        if (err)
                goto error;
 
@@ -284,14 +311,14 @@ static ssize_t nct1008_set_temp_overheat(struct device *dev,
        }
 
        /* External temperature h/w shutdown limit */
-       temp = temperature_to_value(pdata->ext_range, (s8)num);
-       err = i2c_smbus_write_byte_data(client, EXT_THERM_LIMIT_WR, temp);
+       temp = temperature_to_value(pdata->ext_range, (s16)num);
+       err = nct1008_write_reg(client, EXT_THERM_LIMIT_WR, temp);
        if (err < 0)
                goto error;
 
        /* Local temperature h/w shutdown limit */
-       temp = temperature_to_value(pdata->ext_range, (s8)num);
-       err = i2c_smbus_write_byte_data(client, LOCAL_THERM_LIMIT_WR, temp);
+       temp = temperature_to_value(pdata->ext_range, (s16)num);
+       err = nct1008_write_reg(client, LOCAL_THERM_LIMIT_WR, temp);
        if (err < 0)
                goto error;
        return count;
@@ -307,24 +334,23 @@ static ssize_t nct1008_show_temp_alert(struct device *dev,
        struct i2c_client *client = to_i2c_client(dev);
        struct nct1008_platform_data *pdata = client->dev.platform_data;
        int value;
-       s8 temp, temp2;
-       /* External Temperature Throttling limit */
-       value = i2c_smbus_read_byte_data(client, EXT_TEMP_HI_LIMIT_HI_BYTE_RD);
+       s16 temp_hi, temp_lo;
+       /* External Temperature Throttling hi-limit */
+       value = nct1008_read_reg(client, EXT_TEMP_HI_LIMIT_HI_BYTE_RD);
        if (value < 0)
                goto error;
-       temp2 = value_to_temperature(pdata->ext_range, value);
+       temp_hi = value_to_temperature(pdata->ext_range, value);
 
-       /* Local Temperature Throttling limit */
-       value = i2c_smbus_read_byte_data(client, LOCAL_TEMP_HI_LIMIT_RD);
+       /* External Temperature Throttling lo-limit */
+       value = nct1008_read_reg(client, EXT_TEMP_LO_LIMIT_HI_BYTE_RD);
        if (value < 0)
                goto error;
-       temp = value_to_temperature(pdata->ext_range, value);
+       temp_lo = value_to_temperature(pdata->ext_range, value);
 
-       return snprintf(buf, MAX_STR_PRINT, "%d %d\n", temp, temp2);
+       return snprintf(buf, MAX_STR_PRINT, "lo:%d hi:%d\n", temp_lo, temp_hi);
 error:
-       dev_err(dev, "%s: failed to read temperature-overheat "
-               "\n", __func__);
-       return snprintf(buf, MAX_STR_PRINT, " Rd overheat Error\n");
+       dev_err(dev, "%s: failed to read temperature-alert\n", __func__);
+       return snprintf(buf, MAX_STR_PRINT, " Rd alert Error\n");
 }
 
 static ssize_t nct1008_set_temp_alert(struct device *dev,
@@ -349,15 +375,13 @@ static ssize_t nct1008_set_temp_alert(struct device *dev,
        }
 
        /* External Temperature Throttling limit */
-       value = temperature_to_value(pdata->ext_range, (s8)num);
-       err = i2c_smbus_write_byte_data(client, EXT_TEMP_HI_LIMIT_HI_BYTE_WR,
-               value);
+       value = temperature_to_value(pdata->ext_range, (s16)num);
+       err = nct1008_write_reg(client, EXT_TEMP_HI_LIMIT_HI_BYTE_WR, value);
        if (err < 0)
                goto error;
 
        /* Local Temperature Throttling limit */
-       err = i2c_smbus_write_byte_data(client, LOCAL_TEMP_HI_LIMIT_WR,
-               value);
+       err = nct1008_write_reg(client, LOCAL_TEMP_HI_LIMIT_WR, value);
        if (err < 0)
                goto error;
 
@@ -373,28 +397,24 @@ static ssize_t nct1008_show_ext_temp(struct device *dev,
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct nct1008_platform_data *pdata = client->dev.platform_data;
-       s8 temp_value;
+       s16 temp_value;
        int data = 0;
        int data_lo;
 
        if (!dev || !buf || !attr)
                return -EINVAL;
 
-       data = nct1008_wait_till_busy(client);
-       if (data < 0)
-               goto error;
-
        /* When reading the full external temperature value, read the
         * LSB first. This causes the MSB to be locked (that is, the
         * ADC does not write to it) until it is read */
-       data_lo = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO);
+       data_lo = nct1008_read_reg(client, EXT_TEMP_RD_LO);
        if (data_lo < 0) {
                dev_err(&client->dev, "%s: failed to read "
                        "ext_temperature, i2c error=%d\n", __func__, data_lo);
                goto error;
        }
 
-       data = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_HI);
+       data = nct1008_read_reg(client, EXT_TEMP_RD_HI);
        if (data < 0) {
                dev_err(&client->dev, "%s: failed to read "
                        "ext_temperature, i2c error=%d\n", __func__, data);
@@ -428,6 +448,285 @@ static const struct attribute_group nct1008_attr_group = {
        .attrs = nct1008_attributes,
 };
 
+static int nct1008_thermal_set_limits(struct nct1008_data *data,
+                                     long lo_limit_milli,
+                                     long hi_limit_milli)
+{
+       int err;
+       u8 value;
+       bool extended_range = data->plat_data.ext_range;
+       long lo_limit = MILLICELSIUS_TO_CELSIUS(lo_limit_milli);
+       long hi_limit = MILLICELSIUS_TO_CELSIUS(hi_limit_milli);
+
+       if (lo_limit >= hi_limit)
+               return -EINVAL;
+
+       if (data->current_lo_limit != lo_limit) {
+               value = temperature_to_value(extended_range, lo_limit);
+               pr_debug("%s: set lo_limit %ld\n", __func__, lo_limit);
+               err = nct1008_write_reg(data->client,
+                               EXT_TEMP_LO_LIMIT_HI_BYTE_WR, value);
+               if (err)
+                       return err;
+
+               data->current_lo_limit = lo_limit;
+       }
+
+       if (data->current_hi_limit != hi_limit) {
+               value = temperature_to_value(extended_range, hi_limit);
+               pr_debug("%s: set hi_limit %ld\n", __func__, hi_limit);
+               err = nct1008_write_reg(data->client,
+                               EXT_TEMP_HI_LIMIT_HI_BYTE_WR, value);
+               if (err)
+                       return err;
+
+               data->current_hi_limit = hi_limit;
+       }
+
+       return 0;
+}
+
+#ifdef CONFIG_THERMAL
+static void nct1008_update(struct nct1008_data *data)
+{
+       struct thermal_zone_device *thz = data->nct_ext;
+       long low_temp = 0, high_temp = NCT1008_MAX_TEMP * 1000;
+       struct thermal_trip_info *trip_state;
+       long temp, trip_temp, hysteresis_temp;
+       int count;
+       enum events type = 0;
+
+       if (!thz)
+               return;
+
+       thermal_zone_device_update(thz);
+
+       thz->ops->get_temp(thz, &temp);
+
+       for (count = 0; count < thz->trips; count++) {
+               trip_state = &data->plat_data.trips[count];
+               trip_temp = trip_state->trip_temp;
+               hysteresis_temp = trip_temp - trip_state->hysteresis;
+               if ((trip_state->trip_type == THERMAL_TRIP_PASSIVE) &&
+                   !trip_state->tripped)
+                       hysteresis_temp = trip_temp;
+
+               if ((trip_temp >= temp) && (trip_temp < high_temp)) {
+                       high_temp = trip_temp;
+                       type = THERMAL_AUX1;
+               }
+
+               if ((hysteresis_temp < temp) && (hysteresis_temp > low_temp)) {
+                       low_temp = hysteresis_temp;
+                       type = THERMAL_AUX0;
+               }
+       }
+
+       thermal_generate_netlink_event(thz->id, type);
+       nct1008_thermal_set_limits(data, low_temp, high_temp);
+}
+
+static int nct1008_ext_get_temp(struct thermal_zone_device *thz,
+                                       unsigned long *temp)
+{
+       struct nct1008_data *data = thz->devdata;
+       struct i2c_client *client = data->client;
+       struct nct1008_platform_data *pdata = client->dev.platform_data;
+       s16 temp_ext_hi;
+       s16 temp_ext_lo;
+       long temp_ext_milli;
+       u8 value;
+
+       /* Read External Temp */
+       value = nct1008_read_reg(client, EXT_TEMP_RD_LO);
+       if (value < 0)
+               return -1;
+       temp_ext_lo = (value >> 6);
+
+       value = nct1008_read_reg(client, EXT_TEMP_RD_HI);
+       if (value < 0)
+               return -1;
+       temp_ext_hi = value_to_temperature(pdata->ext_range, value);
+
+       temp_ext_milli = CELSIUS_TO_MILLICELSIUS(temp_ext_hi) +
+                        temp_ext_lo * 250;
+       *temp = temp_ext_milli;
+       data->etemp = temp_ext_milli;
+
+       return 0;
+}
+
+static int nct1008_ext_bind(struct thermal_zone_device *thz,
+                           struct thermal_cooling_device *cdev)
+{
+       struct nct1008_data *data = thz->devdata;
+       int i;
+       bool bind = false;
+
+       for (i = 0; i < data->plat_data.num_trips; i++) {
+               if (!strcmp(data->plat_data.trips[i].cdev_type, cdev->type)) {
+                       thermal_zone_bind_cooling_device(thz, i, cdev,
+                                       data->plat_data.trips[i].upper,
+                                       data->plat_data.trips[i].lower);
+                       bind = true;
+               }
+       }
+
+       if (bind)
+               nct1008_update(data);
+
+       return 0;
+}
+
+static int nct1008_ext_unbind(struct thermal_zone_device *thz,
+                             struct thermal_cooling_device *cdev)
+{
+       struct nct1008_data *data = thz->devdata;
+       int i;
+
+       for (i = 0; i < data->plat_data.num_trips; i++) {
+               if (!strcmp(data->plat_data.trips[i].cdev_type, cdev->type))
+                       thermal_zone_unbind_cooling_device(thz, i, cdev);
+       }
+       return 0;
+}
+
+static int nct1008_ext_get_trip_temp(struct thermal_zone_device *thz,
+                                    int trip,
+                                    unsigned long *temp)
+{
+       struct nct1008_data *data = thz->devdata;
+       struct thermal_trip_info *trip_state = &data->plat_data.trips[trip];
+
+       *temp = trip_state->trip_temp;
+
+       if (trip_state->trip_type != THERMAL_TRIP_PASSIVE)
+               return 0;
+
+       if (thz->temperature >= *temp) {
+               trip_state->tripped = true;
+       } else if (trip_state->tripped) {
+               *temp -= trip_state->hysteresis;
+               if (thz->temperature < *temp)
+                       trip_state->tripped = false;
+       }
+
+       return 0;
+}
+
+static int nct1008_ext_set_trip_temp(struct thermal_zone_device *thz,
+                                    int trip,
+                                    unsigned long temp)
+{
+       struct nct1008_data *data = thz->devdata;
+
+       data->plat_data.trips[trip].trip_temp = temp;
+       nct1008_update(data);
+       return 0;
+}
+
+static int nct1008_ext_get_trip_type(struct thermal_zone_device *thz,
+                                    int trip,
+                                    enum thermal_trip_type *type)
+{
+       struct nct1008_data *data = thz->devdata;
+
+       *type = data->plat_data.trips[trip].trip_type;
+       return 0;
+}
+
+static int nct1008_ext_get_trend(struct thermal_zone_device *thz,
+                                int trip,
+                                enum thermal_trend *trend)
+{
+       struct nct1008_data *data = thz->devdata;
+       struct thermal_trip_info *trip_state;
+
+       trip_state = &data->plat_data.trips[trip];
+
+       switch (trip_state->trip_type) {
+       case THERMAL_TRIP_ACTIVE:
+               /* aggressive active cooling */
+               *trend = THERMAL_TREND_RAISING;
+               break;
+       case THERMAL_TRIP_PASSIVE:
+               if (data->etemp > trip_state->trip_temp)
+                       *trend = THERMAL_TREND_RAISING;
+               else
+                       *trend = THERMAL_TREND_DROPPING;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int nct1008_int_get_temp(struct thermal_zone_device *thz,
+                               unsigned long *temp)
+{
+       struct nct1008_data *data = thz->devdata;
+       struct i2c_client *client = data->client;
+       struct nct1008_platform_data *pdata = client->dev.platform_data;
+       s16 temp_local;
+       long temp_local_milli;
+       u8 value;
+
+       /* Read Local Temp */
+       value = nct1008_read_reg(client, LOCAL_TEMP_RD);
+       if (value < 0)
+               return -1;
+       temp_local = value_to_temperature(pdata->ext_range, value);
+
+       temp_local_milli = CELSIUS_TO_MILLICELSIUS(temp_local);
+       *temp = temp_local_milli;
+
+       return 0;
+}
+
+static int nct1008_int_bind(struct thermal_zone_device *thz,
+                           struct thermal_cooling_device *cdev)
+{
+       return 0;
+}
+
+static int nct1008_int_get_trip_temp(struct thermal_zone_device *thz,
+                                    int trip,
+                                    unsigned long *temp)
+{
+       return -1;
+}
+
+static int nct1008_int_get_trip_type(struct thermal_zone_device *thz,
+                                    int trip,
+                                    enum thermal_trip_type *type)
+{
+       return -1;
+}
+
+static struct thermal_zone_device_ops nct_int_ops = {
+       .get_temp = nct1008_int_get_temp,
+       .bind = nct1008_int_bind,
+       .unbind = nct1008_int_bind,
+       .get_trip_type = nct1008_int_get_trip_type,
+       .get_trip_temp = nct1008_int_get_trip_temp,
+};
+
+static struct thermal_zone_device_ops nct_ext_ops = {
+       .get_temp = nct1008_ext_get_temp,
+       .bind = nct1008_ext_bind,
+       .unbind = nct1008_ext_unbind,
+       .get_trip_type = nct1008_ext_get_trip_type,
+       .get_trip_temp = nct1008_ext_get_trip_temp,
+       .set_trip_temp = nct1008_ext_set_trip_temp,
+       .get_trend = nct1008_ext_get_trend,
+};
+#else
+static void nct1008_update(struct nct1008_data *data)
+{
+}
+#endif /* CONFIG_THERMAL */
+
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
@@ -437,8 +736,7 @@ static void print_reg(const char *reg_name, struct seq_file *s,
        struct nct1008_data *nct_data = s->private;
        int ret;
 
-       ret = i2c_smbus_read_byte_data(nct_data->client,
-               offset);
+       ret = nct1008_read_reg(nct_data->client, offset);
        if (ret >= 0)
                seq_printf(s, "Reg %s Addr = 0x%02x Reg 0x%02x "
                "Value 0x%02x\n", reg_name,
@@ -451,7 +749,7 @@ static void print_reg(const char *reg_name, struct seq_file *s,
 
 static int dbg_nct1008_show(struct seq_file *s, void *unused)
 {
-       seq_printf(s, "nct1008 Registers\n");
+       seq_printf(s, "NCT Thermal Sensor Registers\n");
        seq_printf(s, "------------------\n");
        print_reg("Local Temp Value    ",     s, 0x00);
        print_reg("Ext Temp Value Hi   ",     s, 0x01);
@@ -486,12 +784,16 @@ static const struct file_operations debug_fops = {
        .release        = single_release,
 };
 
-static int __init nct1008_debuginit(struct nct1008_data *nct)
+static int nct1008_debuginit(struct nct1008_data *nct)
 {
        int err = 0;
        struct dentry *d;
-       d = debugfs_create_file("nct1008", S_IRUGO, NULL,
-                       (void *)nct, &debug_fops);
+       const char *name = nct1008_id[nct->chip].name;
+
+       /* create debugfs by selecting chipid */
+       d = debugfs_create_file(name, S_IRUGO, NULL,
+               (void *)nct, &debug_fops);
+
        if ((!d) || IS_ERR(d)) {
                dev_err(&nct->client->dev, "Error: %s debugfs_create_file"
                        " returned an error\n", __func__);
@@ -509,19 +811,18 @@ end:
        return err;
 }
 #else
-static int __init nct1008_debuginit(struct nct1008_data *nct)
+static int nct1008_debuginit(struct nct1008_data *nct)
 {
        return 0;
 }
-#endif
+#endif /* CONFIG_DEBUG_FS */
 
 static int nct1008_enable(struct i2c_client *client)
 {
        struct nct1008_data *data = i2c_get_clientdata(client);
        int err;
 
-       err = i2c_smbus_write_byte_data(client, CONFIG_WR,
-                                 data->config & ~STANDBY_BIT);
+       err = nct1008_write_reg(client, CONFIG_WR, data->config);
        if (err < 0)
                dev_err(&client->dev, "%s, line=%d, i2c write error=%d\n",
                __func__, __LINE__, err);
@@ -533,165 +834,131 @@ static int nct1008_disable(struct i2c_client *client)
        struct nct1008_data *data = i2c_get_clientdata(client);
        int err;
 
-       err = i2c_smbus_write_byte_data(client, CONFIG_WR,
-                                 data->config | STANDBY_BIT);
+       err = nct1008_write_reg(client, CONFIG_WR,
+                               data->config | STANDBY_BIT);
        if (err < 0)
                dev_err(&client->dev, "%s, line=%d, i2c write error=%d\n",
                __func__, __LINE__, err);
        return err;
 }
 
-static int nct1008_disable_alert(struct nct1008_data *data)
-{
-       struct i2c_client *client = data->client;
-       int ret = 0;
-       int val;
-
-       /*
-        * Disable ALERT# output, because these chips don't implement
-        * SMBus alert correctly; they should only hold the alert line
-        * low briefly.
-        */
-       val = i2c_smbus_read_byte_data(data->client, CONFIG_RD);
-       if (val < 0) {
-               dev_err(&client->dev, "%s, line=%d, disable alert failed ... "
-                       "i2c read error=%d\n", __func__, __LINE__, val);
-               return val;
-       }
-       data->config = val | ALERT_BIT;
-       ret = i2c_smbus_write_byte_data(client, CONFIG_WR, data->config);
-       if (ret)
-               dev_err(&client->dev, "%s: fail to disable alert, i2c "
-                       "write error=%d#\n", __func__, ret);
-
-       return ret;
-}
-
-static int nct1008_enable_alert(struct nct1008_data *data)
+static int nct1008_within_limits(struct nct1008_data *data)
 {
-       int val;
-       int ret;
+       int intr_status;
 
-       val = i2c_smbus_read_byte_data(data->client, CONFIG_RD);
-       if (val < 0) {
-               dev_err(&data->client->dev, "%s, line=%d, enable alert "
-                       "failed ... i2c read error=%d\n", __func__,
-                       __LINE__, val);
-               return val;
-       }
-       val &= ~(ALERT_BIT | THERM2_BIT);
-       ret = i2c_smbus_write_byte_data(data->client, CONFIG_WR, val);
-       if (ret) {
-               dev_err(&data->client->dev, "%s: fail to enable alert, i2c "
-                       "write error=%d\n", __func__, ret);
-               return ret;
-       }
+       intr_status = nct1008_read_reg(data->client, STATUS_RD);
+       if (intr_status < 0)
+               return intr_status;
 
-       return ret;
+       return !(intr_status & (BIT(3) | BIT(4)));
 }
 
 static void nct1008_work_func(struct work_struct *work)
 {
        struct nct1008_data *data = container_of(work, struct nct1008_data,
                                                work);
-       int err = 0;
-       int intr_status = i2c_smbus_read_byte_data(data->client, STATUS_RD);
+       int err;
+       struct timespec ts;
 
-       if (intr_status < 0) {
-               dev_err(&data->client->dev, "%s, line=%d, i2c read error=%d\n",
-                       __func__, __LINE__, intr_status);
+       err = nct1008_disable(data->client);
+       if (err == -ENODEV)
                return;
-       }
 
-       intr_status &= (BIT(3) | BIT(4));
-       if (!intr_status)
-               return;
+       if (!nct1008_within_limits(data))
+               nct1008_update(data);
 
-       if (data->alert_func) {
-               err = nct1008_disable_alert(data);
-               if (err) {
-                       dev_err(&data->client->dev,
-                               "%s: disable alert fail(error=%d)\n",
-                               __func__, err);
-                       return;
-               }
+       /* Initiate one-shot conversion */
+       nct1008_write_reg(data->client, ONE_SHOT, 0x1);
 
-               data->alert_func(data->alert_data);
+       /* Give hardware necessary time to finish conversion */
+       ts = ns_to_timespec(MAX_CONV_TIME_ONESHOT_MS * 1000 * 1000);
+       hrtimer_nanosleep(&ts, NULL, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
 
-               nct1008_enable_alert(data);
-       }
+       nct1008_read_reg(data->client, STATUS_RD);
 
+       nct1008_enable(data->client);
 
-       if (err)
-               dev_err(&data->client->dev, "%s: fail(error=%d)\n", __func__,
-                       err);
-       else
-               pr_debug("%s: done\n", __func__);
+       enable_irq(data->client->irq);
 }
 
 static irqreturn_t nct1008_irq(int irq, void *dev_id)
 {
        struct nct1008_data *data = dev_id;
 
-       schedule_work(&data->work);
+       disable_irq_nosync(irq);
+       queue_work(data->workqueue, &data->work);
+
        return IRQ_HANDLED;
 }
 
 static void nct1008_power_control(struct nct1008_data *data, bool is_enable)
 {
        int ret;
+       const char *name = nct1008_id[data->chip].name;
+
        if (!data->nct_reg) {
                data->nct_reg = regulator_get(&data->client->dev, "vdd");
                if (IS_ERR_OR_NULL(data->nct_reg)) {
-                       dev_warn(&data->client->dev, "Error [%d] in"
-                               "getting the regulator handle for vdd "
-                               "of %s\n", (int)data->nct_reg,
-                               dev_name(&data->client->dev));
+                       if (PTR_ERR(data->nct_reg) == -ENODEV)
+                               dev_info(&data->client->dev,
+                                       "no regulator found for vdd."
+                                       " Assuming vdd is always powered");
+                       else
+                               dev_warn(&data->client->dev, "Error [%ld] in "
+                                       "getting the regulator handle for"
+                                       " vdd\n", PTR_ERR(data->nct_reg));
                        data->nct_reg = NULL;
                        return;
                }
        }
-       if (is_enable)
+       if (is_enable) {
                ret = regulator_enable(data->nct_reg);
-       else
+               msleep(POWER_ON_DELAY);
+       } else {
                ret = regulator_disable(data->nct_reg);
+       }
 
        if (ret < 0)
-               dev_err(&data->client->dev, "Error in %s rail vdd_nct1008, "
+               dev_err(&data->client->dev, "Error in %s rail vdd_%s, "
                        "error %d\n", (is_enable) ? "enabling" : "disabling",
+                       name,
                        ret);
        else
-               dev_info(&data->client->dev, "success in %s rail vdd_nct1008\n",
-                       (is_enable) ? "enabling" : "disabling");
+               dev_info(&data->client->dev, "success in %s rail vdd_nct%s\n",
+                       (is_enable) ? "enabling" : "disabling",
+                       name);
+
+
 }
 
-static int __devinit nct1008_configure_sensor(struct nct1008_data* data)
+static int nct1008_configure_sensor(struct nct1008_data *data)
 {
        struct i2c_client *client = data->client;
        struct nct1008_platform_data *pdata = client->dev.platform_data;
        u8 value;
-       s8 temp;
+       s16 temp;
        u8 temp2;
        int err;
 
        if (!pdata || !pdata->supported_hwrev)
                return -ENODEV;
 
-       /* Place in Standby */
-       data->config = STANDBY_BIT;
-       err = i2c_smbus_write_byte_data(client, CONFIG_WR, data->config);
+       /* Initially place in Standby */
+       err = nct1008_write_reg(client, CONFIG_WR, STANDBY_BIT);
        if (err)
                goto error;
 
        /* External temperature h/w shutdown limit */
-       value = temperature_to_value(pdata->ext_range, NCT1008_MAX_TEMP);
-       err = i2c_smbus_write_byte_data(client, EXT_THERM_LIMIT_WR, value);
+       value = temperature_to_value(pdata->ext_range,
+                                       pdata->shutdown_ext_limit);
+       err = nct1008_write_reg(client, EXT_THERM_LIMIT_WR, value);
        if (err)
                goto error;
 
        /* Local temperature h/w shutdown limit */
-       value = temperature_to_value(pdata->ext_range, NCT1008_MAX_TEMP);
-       err = i2c_smbus_write_byte_data(client, LOCAL_THERM_LIMIT_WR, value);
+       value = temperature_to_value(pdata->ext_range,
+                                       pdata->shutdown_local_limit);
+       err = nct1008_write_reg(client, LOCAL_THERM_LIMIT_WR, value);
        if (err)
                goto error;
 
@@ -700,38 +967,38 @@ static int __devinit nct1008_configure_sensor(struct nct1008_data* data)
                data->config |= EXTENDED_RANGE_BIT;
        data->config &= ~(THERM2_BIT | ALERT_BIT);
 
-       err = i2c_smbus_write_byte_data(client, CONFIG_WR, data->config);
+       err = nct1008_write_reg(client, CONFIG_WR, data->config);
        if (err)
                goto error;
 
        /* Temperature conversion rate */
-       err = i2c_smbus_write_byte_data(client, CONV_RATE_WR, pdata->conv_rate);
+       err = nct1008_write_reg(client, CONV_RATE_WR, pdata->conv_rate);
        if (err)
                goto error;
 
+       data->conv_period_ms = conv_period_ms_table[pdata->conv_rate];
+
        /* Setup local hi and lo limits */
-       err = i2c_smbus_write_byte_data(client,
+       err = nct1008_write_reg(client,
                LOCAL_TEMP_HI_LIMIT_WR, NCT1008_MAX_TEMP);
        if (err)
                goto error;
 
-       err = i2c_smbus_write_byte_data(client,
-               LOCAL_TEMP_LO_LIMIT_WR, 0);
+       err = nct1008_write_reg(client, LOCAL_TEMP_LO_LIMIT_WR, 0);
        if (err)
                goto error;
 
        /* Setup external hi and lo limits */
-       err = i2c_smbus_write_byte_data(client,
-               EXT_TEMP_LO_LIMIT_HI_BYTE_WR, 0);
+       err = nct1008_write_reg(client, EXT_TEMP_LO_LIMIT_HI_BYTE_WR, 0);
        if (err)
                goto error;
-       err = i2c_smbus_write_byte_data(client, EXT_TEMP_HI_LIMIT_HI_BYTE_WR,
+       err = nct1008_write_reg(client, EXT_TEMP_HI_LIMIT_HI_BYTE_WR,
                        NCT1008_MAX_TEMP);
        if (err)
                goto error;
 
        /* read initial temperature */
-       value = i2c_smbus_read_byte_data(client, LOCAL_TEMP_RD);
+       value = nct1008_read_reg(client, LOCAL_TEMP_RD);
        if (value < 0) {
                err = value;
                goto error;
@@ -739,13 +1006,13 @@ static int __devinit nct1008_configure_sensor(struct nct1008_data* data)
        temp = value_to_temperature(pdata->ext_range, value);
        dev_dbg(&client->dev, "\n initial local temp = %d ", temp);
 
-       value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO);
+       value = nct1008_read_reg(client, EXT_TEMP_RD_LO);
        if (value < 0) {
                err = value;
                goto error;
        }
        temp2 = (value >> 6);
-       value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_HI);
+       value = nct1008_read_reg(client, EXT_TEMP_RD_HI);
        if (value < 0) {
                err = value;
                goto error;
@@ -759,22 +1026,30 @@ static int __devinit nct1008_configure_sensor(struct nct1008_data* data)
                dev_dbg(&client->dev, "\n initial ext temp = %d.0 deg", temp);
 
        /* Remote channel offset */
-       err = i2c_smbus_write_byte_data(client, OFFSET_WR, pdata->offset / 4);
+       err = nct1008_write_reg(client, OFFSET_WR, pdata->offset / 4);
        if (err < 0)
                goto error;
 
        /* Remote channel offset fraction (quarters) */
-       err = i2c_smbus_write_byte_data(client, OFFSET_QUARTER_WR,
+       err = nct1008_write_reg(client, OFFSET_QUARTER_WR,
                                        (pdata->offset % 4) << 6);
        if (err < 0)
                goto error;
 
-       /* register sysfs hooks */
-       err = sysfs_create_group(&client->dev.kobj, &nct1008_attr_group);
-       if (err < 0) {
-               dev_err(&client->dev, "\n sysfs create err=%d ", err);
+       /* Reset current hi/lo limit values with register values */
+       value = nct1008_read_reg(data->client, EXT_TEMP_LO_LIMIT_HI_BYTE_RD);
+       if (value < 0) {
+               err = value;
                goto error;
        }
+       data->current_lo_limit = value_to_temperature(pdata->ext_range, value);
+
+       value = nct1008_read_reg(data->client, EXT_TEMP_HI_LIMIT_HI_BYTE_RD);
+       if (value < 0) {
+               err = value;
+               goto error;
+       }
+       data->current_hi_limit = value_to_temperature(pdata->ext_range, value);
 
        return 0;
 error:
@@ -784,126 +1059,19 @@ error:
 
 static int __devinit nct1008_configure_irq(struct nct1008_data *data)
 {
+       const char *name = nct1008_id[data->chip].name;
+
+       data->workqueue = create_singlethread_workqueue(name);
+
        INIT_WORK(&data->work, nct1008_work_func);
 
        if (data->client->irq < 0)
                return 0;
        else
                return request_irq(data->client->irq, nct1008_irq,
-                       IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                       DRIVER_NAME, data);
-}
-
-static unsigned int get_ext_mode_delay_ms(unsigned int conv_rate)
-{
-       switch (conv_rate) {
-       case 0:
-               return 16000;
-       case 1:
-               return 8000;
-       case 2:
-               return 4000;
-       case 3:
-               return 2000;
-       case 4:
-               return 1000;
-       case 5:
-               return 500;
-       case 6:
-               return 250;
-       case 7:
-               return 125;
-       case 9:
-               return 32;
-       case 10:
-               return 16;
-       case 8:
-       default:
-               return 63;
-       }
-}
-
-int nct1008_thermal_get_temp(struct nct1008_data *data, long *temp)
-{
-       return nct1008_get_temp(&data->client->dev, temp);
-}
-
-int nct1008_thermal_set_limits(struct nct1008_data *data,
-                               long lo_limit_milli,
-                               long hi_limit_milli)
-{
-       int err;
-       u8 value;
-       bool extended_range = data->plat_data.ext_range;
-       long lo_limit = MILLICELSIUS_TO_CELSIUS(lo_limit_milli);
-       long hi_limit = MILLICELSIUS_TO_CELSIUS(hi_limit_milli);
-
-       if (lo_limit >= hi_limit)
-               return -EINVAL;
-
-       if (data->current_lo_limit == lo_limit &&
-               data->current_hi_limit == hi_limit)
-               return 0;
-
-       if (data->current_lo_limit != lo_limit) {
-               value = temperature_to_value(extended_range, lo_limit);
-               pr_debug("%s: %d\n", __func__, value);
-               err = i2c_smbus_write_byte_data(data->client,
-                               EXT_TEMP_LO_LIMIT_HI_BYTE_WR, value);
-               if (err)
-                       return err;
-
-               data->current_lo_limit = lo_limit;
-       }
-
-       if (data->current_hi_limit != hi_limit) {
-               value = temperature_to_value(extended_range, hi_limit);
-               pr_debug("%s: %d\n", __func__, value);
-               err = i2c_smbus_write_byte_data(data->client,
-                               EXT_TEMP_HI_LIMIT_HI_BYTE_WR, value);
-               if (err)
-                       return err;
-
-               data->current_hi_limit = hi_limit;
-       }
-
-       return 0;
-}
-
-int nct1008_thermal_set_alert(struct nct1008_data *data,
-                               void (*alert_func)(void *),
-                               void *alert_data)
-{
-       data->alert_data = alert_data;
-       data->alert_func = alert_func;
-
-       return 0;
-}
-
-int nct1008_thermal_set_shutdown_temp(struct nct1008_data *data,
-                                       long shutdown_temp_milli)
-{
-       struct i2c_client *client = data->client;
-       struct nct1008_platform_data *pdata = client->dev.platform_data;
-       int err;
-       u8 value;
-       long shutdown_temp;
-
-       shutdown_temp = MILLICELSIUS_TO_CELSIUS(shutdown_temp_milli);
-
-       /* External temperature h/w shutdown limit */
-       value = temperature_to_value(pdata->ext_range, shutdown_temp);
-       err = i2c_smbus_write_byte_data(client, EXT_THERM_LIMIT_WR, value);
-       if (err)
-               return err;
-
-       /* Local temperature h/w shutdown limit */
-       value = temperature_to_value(pdata->ext_range, shutdown_temp);
-       err = i2c_smbus_write_byte_data(client, LOCAL_THERM_LIMIT_WR, value);
-       if (err)
-               return err;
-
-       return 0;
+                       IRQF_TRIGGER_LOW,
+                       name,
+                       data);
 }
 
 /*
@@ -927,18 +1095,28 @@ static int __devinit nct1008_probe(struct i2c_client *client,
 {
        struct nct1008_data *data;
        int err;
-       unsigned int delay;
+       int i;
+       int mask = 0;
+       char nct_int_name[THERMAL_NAME_LENGTH];
+       char nct_ext_name[THERMAL_NAME_LENGTH];
 
        data = kzalloc(sizeof(struct nct1008_data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
        data->client = client;
+       data->chip = id->driver_data;
        memcpy(&data->plat_data, client->dev.platform_data,
                sizeof(struct nct1008_platform_data));
        i2c_set_clientdata(client, data);
+       mutex_init(&data->mutex);
 
        nct1008_power_control(data, true);
+       if (!data->nct_reg) {
+               /* power up failure */
+               err = -EIO;
+               goto cleanup;
+       }
        /* extended range recommended steps 1 through 4 taken care
         * in nct1008_configure_sensor function */
        err = nct1008_configure_sensor(data);   /* sensor is in standby */
@@ -964,27 +1142,67 @@ static int __devinit nct1008_probe(struct i2c_client *client,
                goto error;
        }
 
+       /* register sysfs hooks */
+       err = sysfs_create_group(&client->dev.kobj, &nct1008_attr_group);
+       if (err < 0) {
+               dev_err(&client->dev, "\n sysfs create err=%d ", err);
+               goto error;
+       }
+
        err = nct1008_debuginit(data);
        if (err < 0)
                err = 0; /* without debugfs we may continue */
 
-       /* switch to extended mode reports correct temperature
-        * from next measurement cycle */
-       if (data->plat_data.ext_range) {
-               delay = get_ext_mode_delay_ms(
-                       data->plat_data.conv_rate);
-               msleep(delay); /* 63msec for default conv rate 0x8 */
+#ifdef CONFIG_THERMAL
+       for (i = 0; i < data->plat_data.num_trips; i++)
+               mask |= (1 << i);
+
+       if (data->plat_data.loc_name) {
+               strcpy(nct_int_name, "Tboard_");
+               strcpy(nct_ext_name, "Tdiode_");
+               strncat(nct_int_name, data->plat_data.loc_name,
+                       (THERMAL_NAME_LENGTH - strlen("Tboard_")) - 1);
+               strncat(nct_ext_name, data->plat_data.loc_name,
+                       (THERMAL_NAME_LENGTH - strlen("Tdiode_")) - 1);
+       } else {
+               strcpy(nct_int_name, "Tboard");
+               strcpy(nct_ext_name, "Tdiode");
        }
 
-       /* notify callback that probe is done */
-       if (data->plat_data.probe_callback)
-               data->plat_data.probe_callback(data);
+       data->nct_int = thermal_zone_device_register(nct_int_name,
+                                               0,
+                                               0x0,
+                                               data,
+                                               &nct_int_ops,
+                                               NULL,
+                                               2000,
+                                               0);
+       if (IS_ERR_OR_NULL(data->nct_int))
+               goto error;
 
+       data->nct_ext = thermal_zone_device_register(nct_ext_name,
+                                       data->plat_data.num_trips,
+                                       mask,
+                                       data,
+                                       &nct_ext_ops,
+                                       data->plat_data.tzp,
+                                       data->plat_data.passive_delay,
+                                       0);
+       if (IS_ERR_OR_NULL(data->nct_ext)) {
+               thermal_zone_device_unregister(data->nct_int);
+               data->nct_int = NULL;
+               goto error;
+       }
+
+       nct1008_update(data);
+#endif
        return 0;
 
 error:
        dev_err(&client->dev, "\n exit %s, err=%d ", __func__, err);
        nct1008_power_control(data, false);
+cleanup:
+       mutex_destroy(&data->mutex);
        if (data->nct_reg)
                regulator_put(data->nct_reg);
        kfree(data);
@@ -1004,57 +1222,169 @@ static int __devexit nct1008_remove(struct i2c_client *client)
        nct1008_power_control(data, false);
        if (data->nct_reg)
                regulator_put(data->nct_reg);
-
+       mutex_destroy(&data->mutex);
        kfree(data);
 
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int nct1008_suspend(struct i2c_client *client, pm_message_t state)
+static void nct1008_shutdown(struct i2c_client *client)
+{
+       struct nct1008_data *data = i2c_get_clientdata(client);
+       if (client->irq)
+               disable_irq(client->irq);
+
+       cancel_work_sync(&data->work);
+
+       mutex_lock(&data->mutex);
+       data->shutdown_complete = 1;
+       mutex_unlock(&data->mutex);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int nct1008_suspend_powerdown(struct device *dev)
 {
+       struct i2c_client *client = to_i2c_client(dev);
        int err;
+       struct nct1008_data *data = i2c_get_clientdata(client);
 
        disable_irq(client->irq);
        err = nct1008_disable(client);
+       nct1008_power_control(data, false);
        return err;
 }
 
-static int nct1008_resume(struct i2c_client *client)
+static int nct1008_suspend_wakeup(struct device *dev)
 {
-       struct nct1008_data *data = i2c_get_clientdata(client);
+       struct i2c_client *client = to_i2c_client(dev);
        int err;
+       struct nct1008_data *data = i2c_get_clientdata(client);
+       long ext_temp;
+
+       err = nct1008_get_temp(dev, &ext_temp, 0);
+       if (err)
+               goto error;
+
+       if (ext_temp > data->plat_data.suspend_ext_limit_lo)
+               err = nct1008_thermal_set_limits(data,
+                       data->plat_data.suspend_ext_limit_lo,
+                       NCT1008_MAX_TEMP * 1000);
+       else
+               err = nct1008_thermal_set_limits(data,
+                       NCT1008_MIN_TEMP * 1000,
+                       data->plat_data.suspend_ext_limit_hi);
+
+       if (err)
+               goto error;
+
+       /* Enable NCT wake */
+       err = enable_irq_wake(client->irq);
+       if (err)
+               dev_err(&client->dev, "Error: %s, error=%d. failed to enable NCT "
+                               "wakeup\n", __func__, err);
+
+
+       return err;
+
+error:
+       dev_err(&client->dev, "\n error in file=: %s %s() line=%d: "
+               "error=%d. Can't set correct LP1 alarm limits or set wakeup irq, "
+               "shutting down device", __FILE__, __func__, __LINE__, err);
+
+       return nct1008_suspend_powerdown(dev);
+}
+
+static int nct1008_suspend(struct device *dev)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct nct1008_data *data = i2c_get_clientdata(client);
+
+       if (data->plat_data.suspend_with_wakeup &&
+               data->plat_data.suspend_with_wakeup())
+               return nct1008_suspend_wakeup(dev);
+       else
+               return nct1008_suspend_powerdown(dev);
+}
+
 
+static int nct1008_resume_wakeup(struct device *dev)
+{
+       int err = 0;
+       struct i2c_client *client = to_i2c_client(dev);
+
+       err = disable_irq_wake(client->irq);
+       if (err) {
+               dev_err(&client->dev, "Error: %s, error=%d. failed to disable NCT "
+                               "wakeup\n", __func__, err);
+               return err;
+       }
+
+       /* NCT wasn't powered down, so IRQ is still enabled. */
+       /* Disable it before calling update */
+       disable_irq(client->irq);
+
+       return err;
+}
+
+static int nct1008_resume_powerdown(struct device *dev)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       int err = 0;
+       struct nct1008_data *data = i2c_get_clientdata(client);
+
+       nct1008_power_control(data, true);
+       nct1008_configure_sensor(data);
        err = nct1008_enable(client);
        if (err < 0) {
                dev_err(&client->dev, "Error: %s, error=%d\n",
                        __func__, err);
                return err;
        }
+
+       return err;
+}
+
+static int nct1008_resume(struct device *dev)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       int err;
+       struct nct1008_data *data = i2c_get_clientdata(client);
+
+       if (data->plat_data.suspend_with_wakeup &&
+               data->plat_data.suspend_with_wakeup())
+               err = nct1008_resume_wakeup(dev);
+       else
+               err = nct1008_resume_powerdown(dev);
+
+       if (err)
+               return err;
+
+       nct1008_update(data);
        enable_irq(client->irq);
-       schedule_work(&data->work);
 
        return 0;
 }
-#endif
 
-static const struct i2c_device_id nct1008_id[] = {
-       { DRIVER_NAME, 0 },
-       { }
+static const struct dev_pm_ops nct1008_pm_ops = {
+       .suspend        = nct1008_suspend,
+       .resume         = nct1008_resume,
 };
+
+#endif
+
 MODULE_DEVICE_TABLE(i2c, nct1008_id);
 
 static struct i2c_driver nct1008_driver = {
        .driver = {
-               .name   = DRIVER_NAME,
+               .name   = "nct_thermal",
+#ifdef CONFIG_PM_SLEEP
+               .pm = &nct1008_pm_ops,
+#endif
        },
        .probe          = nct1008_probe,
        .remove         = __devexit_p(nct1008_remove),
        .id_table       = nct1008_id,
-#ifdef CONFIG_PM
-       .suspend        = nct1008_suspend,
-       .resume         = nct1008_resume,
-#endif
+       .shutdown       = nct1008_shutdown,
 };
 
 static int __init nct1008_init(void)
@@ -1067,7 +1397,7 @@ static void __exit nct1008_exit(void)
        i2c_del_driver(&nct1008_driver);
 }
 
-MODULE_DESCRIPTION("Temperature sensor driver for OnSemi NCT1008");
+MODULE_DESCRIPTION("Temperature sensor driver for OnSemi NCT1008/NCT72");
 MODULE_LICENSE("GPL");
 
 module_init(nct1008_init);