Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
  hwmon: (smsc47m1) restore missing name attribute
  hwmon: (w83627ehf) don't assume bank 0
  hwmon: (w83627ehf) read fan_div values during probe
  hwmon: fix w83781d temp sensor type setting

diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 338ee4f5461424b01c0895e8dc80348efbf4e350..d3181967f1671a9359fc474dd1a009634c511991 100644 (file)
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -585,6 +585,8 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
 
        if ((err = device_create_file(dev, &dev_attr_alarms)))
                goto error_remove_files;
+       if ((err = device_create_file(dev, &dev_attr_name)))
+               goto error_remove_files;
 
        data->class_dev = hwmon_device_register(dev);
        if (IS_ERR(data->class_dev)) {

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index c51ae2e17758591236721d5b99be8ce2ffea888c..d9a9ec7dd84aee91e1e0f7ddbea62bd44f7be7fa 100644 (file)
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -309,18 +309,16 @@ static inline int is_word_sized(u16 reg)
              || (reg & 0x00ff) == 0x55));
 }
 
-/* We assume that the default bank is 0, thus the following two functions do
-   nothing for registers which live in bank 0. For others, they respectively
-   set the bank register to the correct value (before the register is
-   accessed), and back to 0 (afterwards). */
+/* Registers 0x50-0x5f are banked */
 static inline void w83627ehf_set_bank(struct w83627ehf_data *data, u16 reg)
 {
-       if (reg & 0xff00) {
+       if ((reg & 0x00f0) == 0x50) {
                outb_p(W83627EHF_REG_BANK, data->addr + ADDR_REG_OFFSET);
                outb_p(reg >> 8, data->addr + DATA_REG_OFFSET);
        }
 }
 
+/* Not strictly necessary, but play it safe for now */
 static inline void w83627ehf_reset_bank(struct w83627ehf_data *data, u16 reg)
 {
        if (reg & 0xff00) {
@@ -421,6 +419,31 @@ static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr)
        }
 }
 
+static void w83627ehf_update_fan_div(struct w83627ehf_data *data)
+{
+       int i;
+
+       i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
+       data->fan_div[0] = (i >> 4) & 0x03;
+       data->fan_div[1] = (i >> 6) & 0x03;
+       i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV2);
+       data->fan_div[2] = (i >> 6) & 0x03;
+       i = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
+       data->fan_div[0] |= (i >> 3) & 0x04;
+       data->fan_div[1] |= (i >> 4) & 0x04;
+       data->fan_div[2] |= (i >> 5) & 0x04;
+       if (data->has_fan & ((1 << 3) | (1 << 4))) {
+               i = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
+               data->fan_div[3] = i & 0x03;
+               data->fan_div[4] = ((i >> 2) & 0x03)
+                                | ((i >> 5) & 0x04);
+       }
+       if (data->has_fan & (1 << 3)) {
+               i = w83627ehf_read_value(data, W83627EHF_REG_SMI_OVT);
+               data->fan_div[3] |= (i >> 5) & 0x04;
+       }
+}
+
 static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
 {
        struct w83627ehf_data *data = dev_get_drvdata(dev);
@@ -432,25 +455,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
        if (time_after(jiffies, data->last_updated + HZ + HZ/2)
         || !data->valid) {
                /* Fan clock dividers */
-               i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
-               data->fan_div[0] = (i >> 4) & 0x03;
-               data->fan_div[1] = (i >> 6) & 0x03;
-               i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV2);
-               data->fan_div[2] = (i >> 6) & 0x03;
-               i = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
-               data->fan_div[0] |= (i >> 3) & 0x04;
-               data->fan_div[1] |= (i >> 4) & 0x04;
-               data->fan_div[2] |= (i >> 5) & 0x04;
-               if (data->has_fan & ((1 << 3) | (1 << 4))) {
-                       i = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
-                       data->fan_div[3] = i & 0x03;
-                       data->fan_div[4] = ((i >> 2) & 0x03)
-                                        | ((i >> 5) & 0x04);
-               }
-               if (data->has_fan & (1 << 3)) {
-                       i = w83627ehf_read_value(data, W83627EHF_REG_SMI_OVT);
-                       data->fan_div[3] |= (i >> 5) & 0x04;
-               }
+               w83627ehf_update_fan_div(data);
 
                /* Measured voltages and limits */
                for (i = 0; i < data->in_num; i++) {
@@ -1312,6 +1317,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
        if (!(i & (1 << 1)) && (!fan5pin))
                data->has_fan |= (1 << 4);
 
+       /* Read fan clock dividers immediately */
+       w83627ehf_update_fan_div(data);
+
        /* Register sysfs hooks */
        for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)
                if ((err = device_create_file(dev,

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index f85b48fea1c4700d566edd5413ed265ec4e382b9..c95909cc1d219ab35b0e2c2484a9202220dc341b 100644 (file)
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -740,9 +740,9 @@ store_sensor(struct device *dev, struct device_attribute *da,
 static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR,
        show_sensor, store_sensor, 0);
 static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR,
-       show_sensor, store_sensor, 0);
+       show_sensor, store_sensor, 1);
 static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR,
-       show_sensor, store_sensor, 0);
+       show_sensor, store_sensor, 2);
 
 /* I2C devices get this name attribute automatically, but for ISA devices
    we must create it by ourselves. */