Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 119 insertions, 62 deletions

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index b3841a615595..da72dc12068c 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -41,7 +41,7 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 enum chips {
         any_chip, lm85b, lm85c,
         adm1027, adt7463, adt7468,
-        emc6d100, emc6d102
+        emc6d100, emc6d102, emc6d103, emc6d103s
 };
 
 /* The LM85 registers */
@@ -64,9 +64,12 @@ enum chips {
 #define LM85_REG_VERSTEP                0x3f
 
 #define ADT7468_REG_CFG5                0x7c
-#define         ADT7468_OFF64           0x01
+#define         ADT7468_OFF64           (1 << 0)
+#define         ADT7468_HFPWM           (1 << 1)
 #define IS_ADT7468_OFF64(data)          \
         ((data)->type == adt7468 && !((data)->cfg5 & ADT7468_OFF64))
+#define IS_ADT7468_HFPWM(data)          \
+        ((data)->type == adt7468 && !((data)->cfg5 & ADT7468_HFPWM))
 
 /* These are the recognized values for the above regs */
 #define LM85_COMPANY_NATIONAL           0x01
@@ -87,6 +90,9 @@ enum chips {
 #define LM85_VERSTEP_EMC6D100_A0        0x60
 #define LM85_VERSTEP_EMC6D100_A1        0x61
 #define LM85_VERSTEP_EMC6D102           0x65
+#define LM85_VERSTEP_EMC6D103_A0        0x68
+#define LM85_VERSTEP_EMC6D103_A1        0x69
+#define LM85_VERSTEP_EMC6D103S          0x6A    /* Also known as EMC6D103:A2 */
 
 #define LM85_REG_CONFIG                 0x40
 
@@ -124,7 +130,7 @@ enum chips {
    these macros are called: arguments may be evaluated more than once.
  */
 
-/* IN are scaled acording to built-in resistors */
+/* IN are scaled according to built-in resistors */
 static const int lm85_scaling[] = {  /* .001 Volts */
         2500, 2250, 3300, 5000, 12000,
         3300, 1500, 1800 /*EMC6D100*/
@@ -277,10 +283,6 @@ struct lm85_zone {
         u8 hyst;        /* Low limit hysteresis. (0-15) */
         u8 range;       /* Temp range, encoded */
         s8 critical;    /* "All fans ON" temp limit */
-        u8 off_desired; /* Actual "off" temperature specified.  Preserved
-                         * to prevent "drift" as other autofan control
-                         * values change.
-                         */
         u8 max_desired; /* Actual "max" temperature specified.  Preserved
                          * to prevent "drift" as other autofan control
                          * values change.
@@ -300,6 +302,8 @@ struct lm85_data {
         const int *freq_map;
         enum chips type;
 
+        bool has_vid5;  /* true if VID5 is configured for ADT7463 or ADT7468 */
+
         struct mutex update_lock;
         int valid;              /* !=0 if following fields are valid */
         unsigned long last_reading;     /* In jiffies */
@@ -345,6 +349,8 @@ static const struct i2c_device_id lm85_id[] = {
         { "emc6d100", emc6d100 },
         { "emc6d101", emc6d100 },
         { "emc6d102", emc6d102 },
+        { "emc6d103", emc6d103 },
+        { "emc6d103s", emc6d103s },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm85_id);
@@ -413,8 +419,7 @@ static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr,
         struct lm85_data *data = lm85_update_device(dev);
         int vid;
 
-        if ((data->type == adt7463 || data->type == adt7468) &&
-            (data->vid & 0x80)) {
+        if (data->has_vid5) {
                 /* 6-pin VID (VRM 10) */
                 vid = vid_from_reg(data->vid & 0x3f, data->vrm);
         } else {
@@ -567,8 +572,14 @@ static ssize_t show_pwm_freq(struct device *dev,
 {
         int nr = to_sensor_dev_attr(attr)->index;
         struct lm85_data *data = lm85_update_device(dev);
-        return sprintf(buf, "%d\n", FREQ_FROM_REG(data->freq_map,
-                                                  data->pwm_freq[nr]));
+        int freq;
+
+        if (IS_ADT7468_HFPWM(data))
+                freq = 22500;
+        else
+                freq = FREQ_FROM_REG(data->freq_map, data->pwm_freq[nr]);
+
+        return sprintf(buf, "%d\n", freq);
 }
 
 static ssize_t set_pwm_freq(struct device *dev,
@@ -580,10 +591,22 @@ static ssize_t set_pwm_freq(struct device *dev,
         long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
-        data->pwm_freq[nr] = FREQ_TO_REG(data->freq_map, val);
-        lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),
-                (data->zone[nr].range << 4)
-                | data->pwm_freq[nr]);
+        /* The ADT7468 has a special high-frequency PWM output mode,
+         * where all PWM outputs are driven by a 22.5 kHz clock.
+         * This might confuse the user, but there's not much we can do. */
+        if (data->type == adt7468 && val >= 11300) {    /* High freq. mode */
+                data->cfg5 &= ~ADT7468_HFPWM;
+                lm85_write_value(client, ADT7468_REG_CFG5, data->cfg5);
+        } else {                                        /* Low freq. mode */
+                data->pwm_freq[nr] = FREQ_TO_REG(data->freq_map, val);
+                lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),
+                                 (data->zone[nr].range << 4)
+                                 | data->pwm_freq[nr]);
+                if (data->type == adt7468) {
+                        data->cfg5 |= ADT7468_HFPWM;
+                        lm85_write_value(client, ADT7468_REG_CFG5, data->cfg5);
+                }
+        }
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -866,7 +889,6 @@ static ssize_t set_temp_auto_temp_off(struct device *dev,
 
         mutex_lock(&data->update_lock);
         min = TEMP_FROM_REG(data->zone[nr].limit);
-        data->zone[nr].off_desired = TEMP_TO_REG(val);
         data->zone[nr].hyst = HYST_TO_REG(min - val);
         if (nr == 0 || nr == 1) {
                 lm85_write_value(client, LM85_REG_AFAN_HYST1,
@@ -909,18 +931,6 @@ static ssize_t set_temp_auto_temp_min(struct device *dev,
                 ((data->zone[nr].range & 0x0f) << 4)
                 | (data->pwm_freq[nr] & 0x07));
 
-/* Update temp_auto_hyst and temp_auto_off */
-        data->zone[nr].hyst = HYST_TO_REG(TEMP_FROM_REG(
-                data->zone[nr].limit) - TEMP_FROM_REG(
-                data->zone[nr].off_desired));
-        if (nr == 0 || nr == 1) {
-                lm85_write_value(client, LM85_REG_AFAN_HYST1,
-                        (data->zone[0].hyst << 4)
-                        | data->zone[1].hyst);
-        } else {
-                lm85_write_value(client, LM85_REG_AFAN_HYST2,
-                        (data->zone[2].hyst << 4));
-        }
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -1059,13 +1069,7 @@ static struct attribute *lm85_attributes[] = {
         &sensor_dev_attr_pwm1_auto_pwm_min.dev_attr.attr,
         &sensor_dev_attr_pwm2_auto_pwm_min.dev_attr.attr,
         &sensor_dev_attr_pwm3_auto_pwm_min.dev_attr.attr,
-        &sensor_dev_attr_pwm1_auto_pwm_minctl.dev_attr.attr,
-        &sensor_dev_attr_pwm2_auto_pwm_minctl.dev_attr.attr,
-        &sensor_dev_attr_pwm3_auto_pwm_minctl.dev_attr.attr,
 
-        &sensor_dev_attr_temp1_auto_temp_off.dev_attr.attr,
-        &sensor_dev_attr_temp2_auto_temp_off.dev_attr.attr,
-        &sensor_dev_attr_temp3_auto_temp_off.dev_attr.attr,
         &sensor_dev_attr_temp1_auto_temp_min.dev_attr.attr,
         &sensor_dev_attr_temp2_auto_temp_min.dev_attr.attr,
         &sensor_dev_attr_temp3_auto_temp_min.dev_attr.attr,
@@ -1086,6 +1090,28 @@ static const struct attribute_group lm85_group = {
         .attrs = lm85_attributes,
 };
 
+static struct attribute *lm85_attributes_minctl[] = {
+        &sensor_dev_attr_pwm1_auto_pwm_minctl.dev_attr.attr,
+        &sensor_dev_attr_pwm2_auto_pwm_minctl.dev_attr.attr,
+        &sensor_dev_attr_pwm3_auto_pwm_minctl.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group lm85_group_minctl = {
+        .attrs = lm85_attributes_minctl,
+};
+
+static struct attribute *lm85_attributes_temp_off[] = {
+        &sensor_dev_attr_temp1_auto_temp_off.dev_attr.attr,
+        &sensor_dev_attr_temp2_auto_temp_off.dev_attr.attr,
+        &sensor_dev_attr_temp3_auto_temp_off.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group lm85_group_temp_off = {
+        .attrs = lm85_attributes_temp_off,
+};
+
 static struct attribute *lm85_attributes_in4[] = {
         &sensor_dev_attr_in4_input.dev_attr.attr,
         &sensor_dev_attr_in4_min.dev_attr.attr,
@@ -1229,6 +1255,13 @@ static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info)
                 case LM85_VERSTEP_EMC6D102:
                         type_name = "emc6d102";
                         break;
+                case LM85_VERSTEP_EMC6D103_A0:
+                case LM85_VERSTEP_EMC6D103_A1:
+                        type_name = "emc6d103";
+                        break;
+                case LM85_VERSTEP_EMC6D103S:
+                        type_name = "emc6d103s";
+                        break;
                 }
         } else {
                 dev_dbg(&adapter->dev,
@@ -1241,6 +1274,19 @@ static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info)
         return 0;
 }
 
+static void lm85_remove_files(struct i2c_client *client, struct lm85_data *data)
+{
+        sysfs_remove_group(&client->dev.kobj, &lm85_group);
+        if (data->type != emc6d103s) {
+                sysfs_remove_group(&client->dev.kobj, &lm85_group_minctl);
+                sysfs_remove_group(&client->dev.kobj, &lm85_group_temp_off);
+        }
+        if (!data->has_vid5)
+                sysfs_remove_group(&client->dev.kobj, &lm85_group_in4);
+        if (data->type == emc6d100)
+                sysfs_remove_group(&client->dev.kobj, &lm85_group_in567);
+}
+
 static int lm85_probe(struct i2c_client *client,
                       const struct i2c_device_id *id)
 {
@@ -1259,8 +1305,11 @@ static int lm85_probe(struct i2c_client *client,
         switch (data->type) {
         case adm1027:
         case adt7463:
+        case adt7468:
         case emc6d100:
         case emc6d102:
+        case emc6d103:
+        case emc6d103s:
                 data->freq_map = adm1027_freq_map;
                 break;
         default:
@@ -1278,11 +1327,26 @@ static int lm85_probe(struct i2c_client *client,
         if (err)
                 goto err_kfree;
 
+        /* minctl and temp_off exist on all chips except emc6d103s */
+        if (data->type != emc6d103s) {
+                err = sysfs_create_group(&client->dev.kobj, &lm85_group_minctl);
+                if (err)
+                        goto err_remove_files;
+                err = sysfs_create_group(&client->dev.kobj,
+                                         &lm85_group_temp_off);
+                if (err)
+                        goto err_remove_files;
+        }
+
         /* The ADT7463/68 have an optional VRM 10 mode where pin 21 is used
            as a sixth digital VID input rather than an analog input. */
-        data->vid = lm85_read_value(client, LM85_REG_VID);
-        if (!((data->type == adt7463 || data->type == adt7468) &&
-            (data->vid & 0x80)))
+        if (data->type == adt7463 || data->type == adt7468) {
+                u8 vid = lm85_read_value(client, LM85_REG_VID);
+                if (vid & 0x80)
+                        data->has_vid5 = true;
+        }
+
+        if (!data->has_vid5)
                 if ((err = sysfs_create_group(&client->dev.kobj,
                                         &lm85_group_in4)))
                         goto err_remove_files;
@@ -1303,10 +1367,7 @@ static int lm85_probe(struct i2c_client *client,
 
         /* Error out and cleanup code */
  err_remove_files:
-        sysfs_remove_group(&client->dev.kobj, &lm85_group);
-        sysfs_remove_group(&client->dev.kobj, &lm85_group_in4);
-        if (data->type == emc6d100)
-                sysfs_remove_group(&client->dev.kobj, &lm85_group_in567);
+        lm85_remove_files(client, data);
  err_kfree:
         kfree(data);
         return err;
@@ -1316,10 +1377,7 @@ static int lm85_remove(struct i2c_client *client)
 {
         struct lm85_data *data = i2c_get_clientdata(client);
         hwmon_device_unregister(data->hwmon_dev);
-        sysfs_remove_group(&client->dev.kobj, &lm85_group);
-        sysfs_remove_group(&client->dev.kobj, &lm85_group_in4);
-        if (data->type == emc6d100)
-                sysfs_remove_group(&client->dev.kobj, &lm85_group_in567);
+        lm85_remove_files(client, data);
         kfree(data);
         return 0;
 }
@@ -1416,11 +1474,8 @@ static struct lm85_data *lm85_update_device(struct device *dev)
                             lm85_read_value(client, LM85_REG_FAN(i));
                 }
 
-                if (!((data->type == adt7463 || data->type == adt7468) &&
-                    (data->vid & 0x80))) {
-                        data->in[4] = lm85_read_value(client,
-                                      LM85_REG_IN(4));
-                }
+                if (!data->has_vid5)
+                        data->in[4] = lm85_read_value(client, LM85_REG_IN(4));
 
                 if (data->type == adt7468)
                         data->cfg5 = lm85_read_value(client, ADT7468_REG_CFG5);
@@ -1446,7 +1501,8 @@ static struct lm85_data *lm85_update_device(struct device *dev)
                         /* More alarm bits */
                         data->alarms |= lm85_read_value(client,
                                                 EMC6D100_REG_ALARM3) << 16;
-                } else if (data->type == emc6d102) {
+                } else if (data->type == emc6d102 || data->type == emc6d103 ||
+                           data->type == emc6d103s) {
                         /* Have to read LSB bits after the MSB ones because
                            the reading of the MSB bits has frozen the
                            LSBs (backward from the ADM1027).
@@ -1487,8 +1543,7 @@ static struct lm85_data *lm85_update_device(struct device *dev)
                             lm85_read_value(client, LM85_REG_FAN_MIN(i));
                 }
 
-                if (!((data->type == adt7463 || data->type == adt7468) &&
-                    (data->vid & 0x80))) {
+                if (!data->has_vid5)  {
                         data->in_min[4] = lm85_read_value(client,
                                           LM85_REG_IN_MIN(4));
                         data->in_max[4] = lm85_read_value(client,
@@ -1532,17 +1587,19 @@ static struct lm85_data *lm85_update_device(struct device *dev)
                         }
                 }
 
-                i = lm85_read_value(client, LM85_REG_AFAN_SPIKE1);
-                data->autofan[0].min_off = (i & 0x20) != 0;
-                data->autofan[1].min_off = (i & 0x40) != 0;
-                data->autofan[2].min_off = (i & 0x80) != 0;
+                if (data->type != emc6d103s) {
+                        i = lm85_read_value(client, LM85_REG_AFAN_SPIKE1);
+                        data->autofan[0].min_off = (i & 0x20) != 0;
+                        data->autofan[1].min_off = (i & 0x40) != 0;
+                        data->autofan[2].min_off = (i & 0x80) != 0;
 
-                i = lm85_read_value(client, LM85_REG_AFAN_HYST1);
-                data->zone[0].hyst = i >> 4;
-                data->zone[1].hyst = i & 0x0f;
+                        i = lm85_read_value(client, LM85_REG_AFAN_HYST1);
+                        data->zone[0].hyst = i >> 4;
+                        data->zone[1].hyst = i & 0x0f;
 
-                i = lm85_read_value(client, LM85_REG_AFAN_HYST2);
-                data->zone[2].hyst = i >> 4;
+                        i = lm85_read_value(client, LM85_REG_AFAN_HYST2);
+                        data->zone[2].hyst = i >> 4;
+                }
 
                 data->last_config = jiffies;
         }  /* last_config */