]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/hwmon/f71805f.c
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
[linux-2.6-omap-h63xx.git] / drivers / hwmon / f71805f.c
index ba5e7b70f8cc0f8aa6e2137e1ecac240c9fdd30b..6f60715f34f815021662f03c1ce605a60bf28827 100644 (file)
@@ -35,6 +35,7 @@
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
+#include <linux/ioport.h>
 #include <asm/io.h>
 
 static struct platform_device *pdev;
@@ -102,9 +103,9 @@ superio_exit(int base)
  * ISA constants
  */
 
-#define REGION_LENGTH          2
-#define ADDR_REG_OFFSET                0
-#define DATA_REG_OFFSET                1
+#define REGION_LENGTH          8
+#define ADDR_REG_OFFSET                5
+#define DATA_REG_OFFSET                6
 
 /*
  * Registers
@@ -126,13 +127,19 @@ superio_exit(int base)
 #define F71805F_REG_TEMP_HIGH(nr)      (0x54 + 2 * (nr))
 #define F71805F_REG_TEMP_HYST(nr)      (0x55 + 2 * (nr))
 #define F71805F_REG_TEMP_MODE          0x01
+/* pwm/fan pwmnr from 0 to 2, auto point apnr from 0 to 2 */
+/* map Fintek numbers to our numbers as follows: 9->0, 5->1, 1->2 */
+#define F71805F_REG_PWM_AUTO_POINT_TEMP(pwmnr, apnr) \
+                                       (0xA0 + 0x10 * (pwmnr) + (2 - (apnr)))
+#define F71805F_REG_PWM_AUTO_POINT_FAN(pwmnr, apnr) \
+                                       (0xA4 + 0x10 * (pwmnr) + \
+                                               2 * (2 - (apnr)))
 
 #define F71805F_REG_START              0x00
 /* status nr from 0 to 2 */
 #define F71805F_REG_STATUS(nr)         (0x36 + (nr))
 
 /* individual register bits */
-#define FAN_CTRL_SKIP                  0x80
 #define FAN_CTRL_DC_MODE               0x10
 #define FAN_CTRL_LATCH_FULL            0x08
 #define FAN_CTRL_MODE_MASK             0x03
@@ -144,10 +151,14 @@ superio_exit(int base)
  * Data structures and manipulation thereof
  */
 
+struct f71805f_auto_point {
+       u8 temp[3];
+       u16 fan[3];
+};
+
 struct f71805f_data {
        unsigned short addr;
        const char *name;
-       struct mutex lock;
        struct class_device *class_dev;
 
        struct mutex update_lock;
@@ -171,6 +182,7 @@ struct f71805f_data {
        u8 temp_hyst[3];
        u8 temp_mode;
        unsigned long alarms;
+       struct f71805f_auto_point auto_points[3];
 };
 
 struct f71805f_sio_data {
@@ -272,56 +284,48 @@ static inline u8 temp_to_reg(long val)
  * Device I/O access
  */
 
+/* Must be called with data->update_lock held, except during initialization */
 static u8 f71805f_read8(struct f71805f_data *data, u8 reg)
 {
-       u8 val;
-
-       mutex_lock(&data->lock);
        outb(reg, data->addr + ADDR_REG_OFFSET);
-       val = inb(data->addr + DATA_REG_OFFSET);
-       mutex_unlock(&data->lock);
-
-       return val;
+       return inb(data->addr + DATA_REG_OFFSET);
 }
 
+/* Must be called with data->update_lock held, except during initialization */
 static void f71805f_write8(struct f71805f_data *data, u8 reg, u8 val)
 {
-       mutex_lock(&data->lock);
        outb(reg, data->addr + ADDR_REG_OFFSET);
        outb(val, data->addr + DATA_REG_OFFSET);
-       mutex_unlock(&data->lock);
 }
 
 /* It is important to read the MSB first, because doing so latches the
-   value of the LSB, so we are sure both bytes belong to the same value. */
+   value of the LSB, so we are sure both bytes belong to the same value.
+   Must be called with data->update_lock held, except during initialization */
 static u16 f71805f_read16(struct f71805f_data *data, u8 reg)
 {
        u16 val;
 
-       mutex_lock(&data->lock);
        outb(reg, data->addr + ADDR_REG_OFFSET);
        val = inb(data->addr + DATA_REG_OFFSET) << 8;
        outb(++reg, data->addr + ADDR_REG_OFFSET);
        val |= inb(data->addr + DATA_REG_OFFSET);
-       mutex_unlock(&data->lock);
 
        return val;
 }
 
+/* Must be called with data->update_lock held, except during initialization */
 static void f71805f_write16(struct f71805f_data *data, u8 reg, u16 val)
 {
-       mutex_lock(&data->lock);
        outb(reg, data->addr + ADDR_REG_OFFSET);
        outb(val >> 8, data->addr + DATA_REG_OFFSET);
        outb(++reg, data->addr + ADDR_REG_OFFSET);
        outb(val & 0xff, data->addr + DATA_REG_OFFSET);
-       mutex_unlock(&data->lock);
 }
 
 static struct f71805f_data *f71805f_update_device(struct device *dev)
 {
        struct f71805f_data *data = dev_get_drvdata(dev);
-       int nr;
+       int nr, apnr;
 
        mutex_lock(&data->update_lock);
 
@@ -337,8 +341,6 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
                                           F71805F_REG_IN_LOW(nr));
                }
                for (nr = 0; nr < 3; nr++) {
-                       if (data->fan_ctrl[nr] & FAN_CTRL_SKIP)
-                               continue;
                        data->fan_low[nr] = f71805f_read16(data,
                                            F71805F_REG_FAN_LOW(nr));
                        data->fan_target[nr] = f71805f_read16(data,
@@ -353,6 +355,18 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
                                              F71805F_REG_TEMP_HYST(nr));
                }
                data->temp_mode = f71805f_read8(data, F71805F_REG_TEMP_MODE);
+               for (nr = 0; nr < 3; nr++) {
+                       for (apnr = 0; apnr < 3; apnr++) {
+                               data->auto_points[nr].temp[apnr] =
+                                       f71805f_read8(data,
+                                       F71805F_REG_PWM_AUTO_POINT_TEMP(nr,
+                                                                       apnr));
+                               data->auto_points[nr].fan[apnr] =
+                                       f71805f_read16(data,
+                                       F71805F_REG_PWM_AUTO_POINT_FAN(nr,
+                                                                      apnr));
+                       }
+               }
 
                data->last_limits = jiffies;
        }
@@ -367,8 +381,6 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
                                       F71805F_REG_IN(nr));
                }
                for (nr = 0; nr < 3; nr++) {
-                       if (data->fan_ctrl[nr] & FAN_CTRL_SKIP)
-                               continue;
                        data->fan[nr] = f71805f_read16(data,
                                        F71805F_REG_FAN(nr));
                        data->fan_ctrl[nr] = f71805f_read8(data,
@@ -718,6 +730,70 @@ static ssize_t set_pwm_freq(struct device *dev, struct device_attribute
        return count;
 }
 
+static ssize_t show_pwm_auto_point_temp(struct device *dev,
+                                       struct device_attribute *devattr,
+                                       char* buf)
+{
+       struct f71805f_data *data = dev_get_drvdata(dev);
+       struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);
+       int pwmnr = attr->nr;
+       int apnr = attr->index;
+
+       return sprintf(buf, "%ld\n",
+                      temp_from_reg(data->auto_points[pwmnr].temp[apnr]));
+}
+
+static ssize_t set_pwm_auto_point_temp(struct device *dev,
+                                      struct device_attribute *devattr,
+                                      const char* buf, size_t count)
+{
+       struct f71805f_data *data = dev_get_drvdata(dev);
+       struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);
+       int pwmnr = attr->nr;
+       int apnr = attr->index;
+       unsigned long val = simple_strtol(buf, NULL, 10);
+
+       mutex_lock(&data->update_lock);
+       data->auto_points[pwmnr].temp[apnr] = temp_to_reg(val);
+       f71805f_write8(data, F71805F_REG_PWM_AUTO_POINT_TEMP(pwmnr, apnr),
+                      data->auto_points[pwmnr].temp[apnr]);
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+static ssize_t show_pwm_auto_point_fan(struct device *dev,
+                                      struct device_attribute *devattr,
+                                      char* buf)
+{
+       struct f71805f_data *data = dev_get_drvdata(dev);
+       struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);
+       int pwmnr = attr->nr;
+       int apnr = attr->index;
+
+       return sprintf(buf, "%ld\n",
+                      fan_from_reg(data->auto_points[pwmnr].fan[apnr]));
+}
+
+static ssize_t set_pwm_auto_point_fan(struct device *dev,
+                                     struct device_attribute *devattr,
+                                     const char* buf, size_t count)
+{
+       struct f71805f_data *data = dev_get_drvdata(dev);
+       struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);
+       int pwmnr = attr->nr;
+       int apnr = attr->index;
+       unsigned long val = simple_strtoul(buf, NULL, 10);
+
+       mutex_lock(&data->update_lock);
+       data->auto_points[pwmnr].fan[apnr] = fan_to_reg(val);
+       f71805f_write16(data, F71805F_REG_PWM_AUTO_POINT_FAN(pwmnr, apnr),
+                       data->auto_points[pwmnr].fan[apnr]);
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                         char *buf)
 {
@@ -945,6 +1021,63 @@ static SENSOR_DEVICE_ATTR(pwm3_freq, S_IRUGO | S_IWUSR,
                          show_pwm_freq, set_pwm_freq, 2);
 static SENSOR_DEVICE_ATTR(pwm3_mode, S_IRUGO, show_pwm_mode, NULL, 2);
 
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           0, 0);
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           0, 0);
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           0, 1);
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           0, 1);
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           0, 2);
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           0, 2);
+
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           1, 0);
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           1, 0);
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           1, 1);
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           1, 1);
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           1, 2);
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           1, 2);
+
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           2, 0);
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           2, 0);
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           2, 1);
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           2, 1);
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_temp, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_temp, set_pwm_auto_point_temp,
+                           2, 2);
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_fan, S_IRUGO | S_IWUSR,
+                           show_pwm_auto_point_fan, set_pwm_auto_point_fan,
+                           2, 2);
+
 static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);
 static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);
 static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);
@@ -991,6 +1124,29 @@ static struct attribute *f71805f_attributes[] = {
        &sensor_dev_attr_in7_max.dev_attr.attr,
        &sensor_dev_attr_in7_min.dev_attr.attr,
 
+       &sensor_dev_attr_fan1_input.dev_attr.attr,
+       &sensor_dev_attr_fan1_min.dev_attr.attr,
+       &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan1_target.dev_attr.attr,
+       &sensor_dev_attr_fan2_input.dev_attr.attr,
+       &sensor_dev_attr_fan2_min.dev_attr.attr,
+       &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan2_target.dev_attr.attr,
+       &sensor_dev_attr_fan3_input.dev_attr.attr,
+       &sensor_dev_attr_fan3_min.dev_attr.attr,
+       &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan3_target.dev_attr.attr,
+
+       &sensor_dev_attr_pwm1.dev_attr.attr,
+       &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+       &sensor_dev_attr_pwm2.dev_attr.attr,
+       &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm2_mode.dev_attr.attr,
+       &sensor_dev_attr_pwm3.dev_attr.attr,
+       &sensor_dev_attr_pwm3_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm3_mode.dev_attr.attr,
+
        &sensor_dev_attr_temp1_input.dev_attr.attr,
        &sensor_dev_attr_temp1_max.dev_attr.attr,
        &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
@@ -1004,6 +1160,25 @@ static struct attribute *f71805f_attributes[] = {
        &sensor_dev_attr_temp3_max_hyst.dev_attr.attr,
        &sensor_dev_attr_temp3_type.dev_attr.attr,
 
+       &sensor_dev_attr_pwm1_auto_point1_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm1_auto_point1_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm1_auto_point2_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm1_auto_point2_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm1_auto_point3_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm1_auto_point3_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_point1_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_point1_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_point2_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_point2_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_point3_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_point3_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm3_auto_point1_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm3_auto_point1_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm3_auto_point2_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm3_auto_point2_fan.dev_attr.attr,
+       &sensor_dev_attr_pwm3_auto_point3_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm3_auto_point3_fan.dev_attr.attr,
+
        &sensor_dev_attr_in0_alarm.dev_attr.attr,
        &sensor_dev_attr_in1_alarm.dev_attr.attr,
        &sensor_dev_attr_in2_alarm.dev_attr.attr,
@@ -1061,43 +1236,6 @@ static const struct attribute_group f71805f_group_optin[4] = {
        { .attrs = f71805f_attributes_optin[3] },
 };
 
-static struct attribute *f71805f_attributes_fan[3][8] = {
-       {
-               &sensor_dev_attr_fan1_input.dev_attr.attr,
-               &sensor_dev_attr_fan1_min.dev_attr.attr,
-               &sensor_dev_attr_fan1_alarm.dev_attr.attr,
-               &sensor_dev_attr_fan1_target.dev_attr.attr,
-               &sensor_dev_attr_pwm1.dev_attr.attr,
-               &sensor_dev_attr_pwm1_enable.dev_attr.attr,
-               &sensor_dev_attr_pwm1_mode.dev_attr.attr,
-               NULL
-       }, {
-               &sensor_dev_attr_fan2_input.dev_attr.attr,
-               &sensor_dev_attr_fan2_min.dev_attr.attr,
-               &sensor_dev_attr_fan2_alarm.dev_attr.attr,
-               &sensor_dev_attr_fan2_target.dev_attr.attr,
-               &sensor_dev_attr_pwm2.dev_attr.attr,
-               &sensor_dev_attr_pwm2_enable.dev_attr.attr,
-               &sensor_dev_attr_pwm2_mode.dev_attr.attr,
-               NULL
-       }, {
-               &sensor_dev_attr_fan3_input.dev_attr.attr,
-               &sensor_dev_attr_fan3_min.dev_attr.attr,
-               &sensor_dev_attr_fan3_alarm.dev_attr.attr,
-               &sensor_dev_attr_fan3_target.dev_attr.attr,
-               &sensor_dev_attr_pwm3.dev_attr.attr,
-               &sensor_dev_attr_pwm3_enable.dev_attr.attr,
-               &sensor_dev_attr_pwm3_mode.dev_attr.attr,
-               NULL
-       }
-};
-
-static const struct attribute_group f71805f_group_fan[3] = {
-       { .attrs = f71805f_attributes_fan[0] },
-       { .attrs = f71805f_attributes_fan[1] },
-       { .attrs = f71805f_attributes_fan[2] },
-};
-
 /* We don't include pwm_freq files in the arrays above, because they must be
    created conditionally (only if pwm_mode is 1 == PWM) */
 static struct attribute *f71805f_attributes_pwm_freq[] = {
@@ -1168,8 +1306,14 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
        }
 
        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+       if (!request_region(res->start + ADDR_REG_OFFSET, 2, DRVNAME)) {
+               err = -EBUSY;
+               dev_err(&pdev->dev, "Failed to request region 0x%lx-0x%lx\n",
+                       (unsigned long)(res->start + ADDR_REG_OFFSET),
+                       (unsigned long)(res->start + ADDR_REG_OFFSET + 1));
+               goto exit_free;
+       }
        data->addr = res->start;
-       mutex_init(&data->lock);
        data->name = names[sio_data->kind];
        mutex_init(&data->update_lock);
 
@@ -1194,7 +1338,7 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
 
        /* Register sysfs interface files */
        if ((err = sysfs_create_group(&pdev->dev.kobj, &f71805f_group)))
-               goto exit_free;
+               goto exit_release_region;
        if (data->has_in & (1 << 4)) { /* in4 */
                if ((err = sysfs_create_group(&pdev->dev.kobj,
                                              &f71805f_group_optin[0])))
@@ -1216,11 +1360,6 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
                        goto exit_remove_files;
        }
        for (i = 0; i < 3; i++) {
-               if (data->fan_ctrl[i] & FAN_CTRL_SKIP)
-                       continue;
-               if ((err = sysfs_create_group(&pdev->dev.kobj,
-                                             &f71805f_group_fan[i])))
-                       goto exit_remove_files;
                /* If control mode is PWM, create pwm_freq file */
                if (!(data->fan_ctrl[i] & FAN_CTRL_DC_MODE)) {
                        if ((err = sysfs_create_file(&pdev->dev.kobj,
@@ -1252,9 +1391,9 @@ exit_remove_files:
        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group);
        for (i = 0; i < 4; i++)
                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);
-       for (i = 0; i < 3; i++)
-               sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_fan[i]);
        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
+exit_release_region:
+       release_region(res->start + ADDR_REG_OFFSET, 2);
 exit_free:
        platform_set_drvdata(pdev, NULL);
        kfree(data);
@@ -1265,18 +1404,20 @@ exit:
 static int __devexit f71805f_remove(struct platform_device *pdev)
 {
        struct f71805f_data *data = platform_get_drvdata(pdev);
+       struct resource *res;
        int i;
 
-       platform_set_drvdata(pdev, NULL);
        hwmon_device_unregister(data->class_dev);
        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group);
        for (i = 0; i < 4; i++)
                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);
-       for (i = 0; i < 3; i++)
-               sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_fan[i]);
        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
+       platform_set_drvdata(pdev, NULL);
        kfree(data);
 
+       res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+       release_region(res->start + ADDR_REG_OFFSET, 2);
+
        return 0;
 }
 
@@ -1314,28 +1455,22 @@ static int __init f71805f_device_add(unsigned short address,
                goto exit_device_put;
        }
 
-       pdev->dev.platform_data = kmalloc(sizeof(struct f71805f_sio_data),
-                                         GFP_KERNEL);
-       if (!pdev->dev.platform_data) {
-               err = -ENOMEM;
+       err = platform_device_add_data(pdev, sio_data,
+                                      sizeof(struct f71805f_sio_data));
+       if (err) {
                printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
                goto exit_device_put;
        }
-       memcpy(pdev->dev.platform_data, sio_data,
-              sizeof(struct f71805f_sio_data));
 
        err = platform_device_add(pdev);
        if (err) {
                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
                       err);
-               goto exit_kfree_data;
+               goto exit_device_put;
        }
 
        return 0;
 
-exit_kfree_data:
-       kfree(pdev->dev.platform_data);
-       pdev->dev.platform_data = NULL;
 exit_device_put:
        platform_device_put(pdev);
 exit:
@@ -1387,6 +1522,7 @@ static int __init f71805f_find(int sioaddr, unsigned short *address,
                       "skipping\n");
                goto exit;
        }
+       *address &= ~(REGION_LENGTH - 1);       /* Ignore 3 LSB */
 
        err = 0;
        printk(KERN_INFO DRVNAME ": Found %s chip at %#x, revision %u\n",
@@ -1427,10 +1563,7 @@ exit:
 
 static void __exit f71805f_exit(void)
 {
-       kfree(pdev->dev.platform_data);
-       pdev->dev.platform_data = NULL;
        platform_device_unregister(pdev);
-
        platform_driver_unregister(&f71805f_driver);
 }