This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / i2c / chips / smsc47m1.c

diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/i2c/chips/smsc47m1.c
index 39c6871..078c65f 100644 (file)
--- a/drivers/i2c/chips/smsc47m1.c
+++ b/drivers/i2c/chips/smsc47m1.c
@@ -34,14 +34,22 @@
 #include <asm/io.h>
 
 static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 /* Address is autodetected, there is no default value */
 static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
+static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
 static struct i2c_force_data forces[] = {{NULL}};
 
 enum chips { any_chip, smsc47m1 };
 static struct i2c_address_data addr_data = {
        .normal_i2c             = normal_i2c,
+       .normal_i2c_range       = normal_i2c_range,
        .normal_isa             = normal_isa,
+       .normal_isa_range       = normal_isa_range,
+       .probe                  = normal_i2c,           /* cheat */
+       .probe_range            = normal_i2c_range,     /* cheat */
+       .ignore                 = normal_i2c,           /* cheat */
+       .ignore_range           = normal_i2c_range,     /* cheat */
        .forces                 = forces,
 };
 
@@ -174,13 +182,13 @@ static ssize_t get_fan_div(struct device *dev, char *buf, int nr)
        return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]));
 }
 
-static ssize_t get_pwm(struct device *dev, char *buf, int nr)
+static ssize_t get_fan_pwm(struct device *dev, char *buf, int nr)
 {
        struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
        return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr]));
 }
 
-static ssize_t get_pwm_en(struct device *dev, char *buf, int nr)
+static ssize_t get_fan_pwm_en(struct device *dev, char *buf, int nr)
 {
        struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
        return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr]));
@@ -248,7 +256,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
        return count;
 }
 
-static ssize_t set_pwm(struct device *dev, const char *buf,
+static ssize_t set_fan_pwm(struct device *dev, const char *buf,
                size_t count, int nr)
 {
        struct i2c_client *client = to_i2c_client(dev);
@@ -267,7 +275,7 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
        return count;
 }
 
-static ssize_t set_pwm_en(struct device *dev, const char *buf,
+static ssize_t set_fan_pwm_en(struct device *dev, const char *buf,
                size_t count, int nr)
 {
        struct i2c_client *client = to_i2c_client(dev);
@@ -290,43 +298,43 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
 #define fan_present(offset)                                            \
 static ssize_t get_fan##offset (struct device *dev, char *buf)         \
 {                                                                      \
-       return get_fan(dev, buf, offset - 1);                           \
+       return get_fan(dev, buf, 0x##offset - 1);                       \
 }                                                                      \
 static ssize_t get_fan##offset##_min (struct device *dev, char *buf)   \
 {                                                                      \
-       return get_fan_min(dev, buf, offset - 1);                       \
+       return get_fan_min(dev, buf, 0x##offset - 1);                   \
 }                                                                      \
 static ssize_t set_fan##offset##_min (struct device *dev,              \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_fan_min(dev, buf, count, offset - 1);                \
+       return set_fan_min(dev, buf, count, 0x##offset - 1);            \
 }                                                                      \
 static ssize_t get_fan##offset##_div (struct device *dev, char *buf)   \
 {                                                                      \
-       return get_fan_div(dev, buf, offset - 1);                       \
+       return get_fan_div(dev, buf, 0x##offset - 1);                   \
 }                                                                      \
 static ssize_t set_fan##offset##_div (struct device *dev,              \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_fan_div(dev, buf, count, offset - 1);                \
+       return set_fan_div(dev, buf, count, 0x##offset - 1);            \
 }                                                                      \
-static ssize_t get_pwm##offset (struct device *dev, char *buf)         \
+static ssize_t get_fan##offset##_pwm (struct device *dev, char *buf)   \
 {                                                                      \
-       return get_pwm(dev, buf, offset - 1);                           \
+       return get_fan_pwm(dev, buf, 0x##offset - 1);                   \
 }                                                                      \
-static ssize_t set_pwm##offset (struct device *dev,                    \
+static ssize_t set_fan##offset##_pwm (struct device *dev,              \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_pwm(dev, buf, count, offset - 1);                    \
+       return set_fan_pwm(dev, buf, count, 0x##offset - 1);            \
 }                                                                      \
-static ssize_t get_pwm##offset##_en (struct device *dev, char *buf)    \
+static ssize_t get_fan##offset##_pwm_en (struct device *dev, char *buf)        \
 {                                                                      \
-       return get_pwm_en(dev, buf, offset - 1);                        \
+       return get_fan_pwm_en(dev, buf, 0x##offset - 1);                \
 }                                                                      \
-static ssize_t set_pwm##offset##_en (struct device *dev,               \
+static ssize_t set_fan##offset##_pwm_en (struct device *dev,           \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_pwm_en(dev, buf, count, offset - 1);                 \
+       return set_fan_pwm_en(dev, buf, count, 0x##offset - 1);         \
 }                                                                      \
 static DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan##offset,      \
                NULL);                                                  \
@@ -334,10 +342,10 @@ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,          \
                get_fan##offset##_min, set_fan##offset##_min);          \
 static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,               \
                get_fan##offset##_div, set_fan##offset##_div);          \
-static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,                     \
-               get_pwm##offset, set_pwm##offset);                      \
-static DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,            \
-               get_pwm##offset##_en, set_pwm##offset##_en);
+static DEVICE_ATTR(fan##offset##_pwm, S_IRUGO | S_IWUSR,               \
+               get_fan##offset##_pwm, set_fan##offset##_pwm);          \
+static DEVICE_ATTR(fan##offset##_pwm_enable, S_IRUGO | S_IWUSR,                \
+               get_fan##offset##_pwm_en, set_fan##offset##_pwm_en);
 
 fan_present(1);
 fan_present(2);
@@ -394,7 +402,6 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
        struct i2c_client *new_client;
        struct smsc47m1_data *data;
        int err = 0;
-       int fan1, fan2, pwm1, pwm2;
 
        if (!i2c_is_isa_adapter(adapter)) {
                return 0;
@@ -424,22 +431,6 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
        new_client->id = smsc47m1_id++;
        init_MUTEX(&data->update_lock);
 
-       /* If no function is properly configured, there's no point in
-          actually registering the chip. */
-       fan1 = (smsc47m1_read_value(new_client, SMSC47M1_REG_TPIN(0)) & 0x05)
-              == 0x05;
-       fan2 = (smsc47m1_read_value(new_client, SMSC47M1_REG_TPIN(1)) & 0x05)
-              == 0x05;
-       pwm1 = (smsc47m1_read_value(new_client, SMSC47M1_REG_PPIN(0)) & 0x05)
-              == 0x04;
-       pwm2 = (smsc47m1_read_value(new_client, SMSC47M1_REG_PPIN(1)) & 0x05)
-              == 0x04;
-       if (!(fan1 || fan2 || pwm1 || pwm2)) {
-               dev_warn(&new_client->dev, "Device is not configured, will not use\n");
-               err = -ENODEV;
-               goto error_free;
-       }
-
        if ((err = i2c_attach_client(new_client)))
                goto error_free;
 
@@ -451,7 +442,8 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
           function. */
        smsc47m1_update_device(&new_client->dev, 1);
 
-       if (fan1) {
+       if ((smsc47m1_read_value(new_client, SMSC47M1_REG_TPIN(0)) & 0x05)
+           == 0x05) {
                device_create_file(&new_client->dev, &dev_attr_fan1_input);
                device_create_file(&new_client->dev, &dev_attr_fan1_min);
                device_create_file(&new_client->dev, &dev_attr_fan1_div);
@@ -459,7 +451,8 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
                dev_dbg(&new_client->dev, "Fan 1 not enabled by hardware, "
                        "skipping\n");
 
-       if (fan2) {
+       if ((smsc47m1_read_value(new_client, SMSC47M1_REG_TPIN(1)) & 0x05)
+           == 0x05) {
                device_create_file(&new_client->dev, &dev_attr_fan2_input);
                device_create_file(&new_client->dev, &dev_attr_fan2_min);
                device_create_file(&new_client->dev, &dev_attr_fan2_div);
@@ -467,15 +460,17 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
                dev_dbg(&new_client->dev, "Fan 2 not enabled by hardware, "
                        "skipping\n");
 
-       if (pwm1) {
-               device_create_file(&new_client->dev, &dev_attr_pwm1);
-               device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
+       if ((smsc47m1_read_value(new_client, SMSC47M1_REG_PPIN(0)) & 0x05)
+           == 0x04) {
+               device_create_file(&new_client->dev, &dev_attr_fan1_pwm);
+               device_create_file(&new_client->dev, &dev_attr_fan1_pwm_enable);
        } else
                dev_dbg(&new_client->dev, "PWM 1 not enabled by hardware, "
                        "skipping\n");
-       if (pwm2) {
-               device_create_file(&new_client->dev, &dev_attr_pwm2);
-               device_create_file(&new_client->dev, &dev_attr_pwm2_enable);
+       if ((smsc47m1_read_value(new_client, SMSC47M1_REG_PPIN(1)) & 0x05)
+           == 0x04) {
+               device_create_file(&new_client->dev, &dev_attr_fan2_pwm);
+               device_create_file(&new_client->dev, &dev_attr_fan2_pwm_enable);
        } else
                dev_dbg(&new_client->dev, "PWM 2 not enabled by hardware, "
                        "skipping\n");