lkml.org 
[lkml]   [2009]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 02/28] hwmon: (smsc47m1) Differentiate between LPC47M233 and LPC47M292
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Jean Delvare <khali@linux-fr.org>

    commit 1b54ab450b180eaeeb0eee6f0f64349246a22c14 upstream.

    The SMSC LPC47M233 and LPC47M292 chips have the same device ID but
    are not compatible.

    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Juerg Haefliger <juergh@gmail.com>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/hwmon/smsc47m1.c | 11 +++++++++++
    1 file changed, 11 insertions(+)

    --- a/drivers/hwmon/smsc47m1.c
    +++ b/drivers/hwmon/smsc47m1.c
    @@ -85,6 +85,7 @@ superio_exit(void)
    #define SUPERIO_REG_ACT 0x30
    #define SUPERIO_REG_BASE 0x60
    #define SUPERIO_REG_DEVID 0x20
    +#define SUPERIO_REG_DEVREV 0x21

    /* Logical device registers */

    @@ -428,6 +429,9 @@ static int __init smsc47m1_find(unsigned
    * The LPC47M292 (device id 0x6B) is somewhat compatible, but it
    * supports a 3rd fan, and the pin configuration registers are
    * unfortunately different.
    + * The LPC47M233 has the same device id (0x6B) but is not compatible.
    + * We check the high bit of the device revision register to
    + * differentiate them.
    */
    switch (val) {
    case 0x51:
    @@ -447,6 +451,13 @@ static int __init smsc47m1_find(unsigned
    sio_data->type = smsc47m1;
    break;
    case 0x6B:
    + if (superio_inb(SUPERIO_REG_DEVREV) & 0x80) {
    + pr_debug(DRVNAME ": "
    + "Found SMSC LPC47M233, unsupported\n");
    + superio_exit();
    + return -ENODEV;
    + }
    +
    pr_info(DRVNAME ": Found SMSC LPC47M292\n");
    sio_data->type = smsc47m2;
    break;



    \
     
     \ /
      Last update: 2009-08-13 21:51    [W:0.026 / U:0.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site