Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c92943152884e3777439ad40a40126f2e51b8ea8
Commit:     c92943152884e3777439ad40a40126f2e51b8ea8
Parent:     46bed4dfe5f95f1fc8f68ead592a7e295bbbe01e
Author:     Rudolf Marek <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 18 22:14:24 2007 +0100
Committer:  Jean Delvare <[EMAIL PROTECTED]>
CommitDate: Thu Jan 18 22:14:24 2007 +0100

    hwmon/w83793: Fix the fan input detection
    
    Catch the cases when alternative pins are used to route the
    fan9-12 input.
    
    Signed-off-by: Rudolf Marek <[EMAIL PROTECTED]>
    Signed-off-by: Gong Jun <[EMAIL PROTECTED]>
    Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
---
 drivers/hwmon/w83793.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index c2b7834..7cadef8 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -1327,6 +1327,20 @@ static int w83793_detect(struct i2c_adapter *adapter, 
int address, int kind)
                data->has_pwm |= 0x80;
        }
 
+       tmp = w83793_read_value(client, W83793_REG_FANIN_SEL);
+       if ((tmp & 0x01) && (val & 0x08)) {     /* fan 9, second location */
+               data->has_fan |= 0x100;
+       }
+       if ((tmp & 0x02) && (val & 0x10)) {     /* fan 10, second location */
+               data->has_fan |= 0x200;
+       }
+       if ((tmp & 0x04) && (val & 0x20)) {     /* fan 11, second location */
+               data->has_fan |= 0x400;
+       }
+       if ((tmp & 0x08) && (val & 0x40)) {     /* fan 12, second location */
+               data->has_fan |= 0x800;
+       }
+
        /* check the temp1-6 mode, ignore former AMDSI selected inputs */
        tmp = w83793_read_value(client,W83793_REG_TEMP_MODE[0]);
        if (tmp & 0x01)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to