it87: Initial / experimental support for IT8783E/F

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/README b/README
index 23b7def21ba8bc5fe9e797e2b4cce1b94245d969..22943c8b14e96adac4a6758b497eb60d8d3e2fd6 100644 (file)
--- a/README
+++ b/README
@@ -30,6 +30,10 @@ Supported chips:
     Prefix: 'it8728'
     Addresses scanned: from Super I/O config space (8 I/O ports)
     Datasheet: Not publicly available
+  * IT8783E/F
+    Prefix: 'it8783'
+    Addresses scanned: from Super I/O config space (8 I/O ports)
+    Datasheet: Not publicly available
   * SiS950   [clone of IT8705F]
     Prefix: 'it87'
     Addresses scanned: from Super I/O config space (8 I/O ports)
@@ -75,7 +79,8 @@ Description
 -----------
 
 This driver implements support for the IT8705F, IT8712F, IT8716F,
-IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E and SiS950 chips.
+IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E, IT8387E/F,
+and SiS950 chips.
 
 These chips are 'Super I/O chips', supporting floppy disks, infrared ports,
 joysticks and other miscellaneous stuff. For hardware monitoring, they
@@ -95,12 +100,12 @@ the driver won't notice and report changes in the VID value. The two
 upper VID bits share their pins with voltage inputs (in5 and in6) so you
 can't have both on a given board.
 
-The IT8716F, IT8718F, IT8720F, IT8721F/IT8758E and later IT8712F revisions
-have support for 2 additional fans. The additional fans are supported by the
-driver.
+The IT8716F, IT8718F, IT8720F, IT8721F/IT8758E, IT8783E/F, and later IT8712F
+revisions have support for 2 additional fans. The additional fans are supported
+by the driver.
 
-The IT8716F, IT8718F, IT8720F and IT8721F/IT8758E, and late IT8712F and
-IT8705F also have optional 16-bit tachometer counters for fans 1 to 3. This
+The IT8716F, IT8718F, IT8720F and IT8721F/IT8758E, IT8783E/F, and late IT8712F
+and IT8705F also have optional 16-bit tachometer counters for fans 1 to 3. This
 is better (no more fan clock divider mess) but not compatible with the older
 chips and revisions. The 16-bit tachometer mode is enabled by the driver when
 one of the above chips is detected.
@@ -131,9 +136,9 @@ inputs can measure voltages between 0 and 4.08 volts, with a resolution of
 0.016 volt (except IT8721F/IT8758E and IT8728F: 0.012 volt.) The battery
 voltage in8 does not have limit registers.
 
-On the IT8721F/IT8758E, some voltage inputs are internal and scaled inside
-the chip (in7, in8 and optionally in3). The driver handles this transparently
-so user-space doesn't have to care.
+On the IT8721F/IT8758E/IT8783E/F, some voltage inputs are internal and scaled
+inside the chip (in7, in8 and optionally in3). The driver handles this
+transparently so user-space doesn't have to care.
 
 The VID lines (IT8712F/IT8716F/IT8718F/IT8720F) encode the core voltage value:
 the voltage level your processor should work with. This is hardcoded by

diff --git a/it87.c b/it87.c
index 0b204e4cf51c5303836c9254d64f808fd8364115..4bec40db81f8c12695614cadee4768fb38edac83 100644 (file)
--- a/it87.c
+++ b/it87.c
@@ -19,6 +19,7 @@
  *            IT8726F  Super I/O chip w/LPC interface
  *            IT8728F  Super I/O chip w/LPC interface
  *            IT8758E  Super I/O chip w/LPC interface
+ *            IT8783E/F Super I/O chip w/LPC interface
  *            Sis950   A clone of the IT8705F
  *
  *  Copyright (C) 2001 Chris Gauthron
@@ -59,7 +60,7 @@
 
 #define DRVNAME "it87"
 
-enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728 };
+enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8783 };
 
 static unsigned short force_id;
 module_param(force_id, ushort, 0);
@@ -137,13 +138,17 @@ static inline void superio_exit(void)
 #define IT8721F_DEVID 0x8721
 #define IT8726F_DEVID 0x8726
 #define IT8728F_DEVID 0x8728
+#define IT8783E_DEVID 0x8783
 #define IT87_ACT_REG  0x30
 #define IT87_BASE_REG 0x60
 
 /* Logical device 7 registers (IT8712F and later) */
+#define IT87_SIO_GPIO1_REG     0x25
 #define IT87_SIO_GPIO3_REG     0x27
 #define IT87_SIO_GPIO5_REG     0x29
+#define IT87_SIO_PINX1_REG     0x2a    /* Pin selection */
 #define IT87_SIO_PINX2_REG     0x2c    /* Pin selection */
+#define IT87_SIO_SPI_REG       0xef    /* SPI function pin select */
 #define IT87_SIO_VID_REG       0xfc    /* VID value */
 #define IT87_SIO_BEEP_PIN_REG  0xf6    /* Beep pin mapping */
 
@@ -313,8 +318,12 @@ static u8 in_to_reg(const struct it87_data *data, int nr, long val)
                        lsb = 24;
                else
                        lsb = 12;
-       } else
-               lsb = 16;
+       } else {
+               if (data->in_scaled & (1 << nr))
+                       lsb = 32;
+               else
+                       lsb = 16;
+       }
 
        val = DIV_ROUND_CLOSEST(val, lsb);
        return SENSORS_LIMIT(val, 0, 255);
@@ -327,8 +336,12 @@ static int in_from_reg(const struct it87_data *data, int nr, int val)
                        return val * 24;
                else
                        return val * 12;
-       } else
-               return val * 16;
+       } else {
+               if (data->in_scaled & (1 << nr))
+                       return val * 32;
+               else
+                       return val * 16;
+       }
 }
 
 static inline u8 FAN_TO_REG(long rpm, int div)
@@ -407,7 +420,8 @@ static inline int has_16bit_fans(const struct it87_data *data)
            || data->type == it8718
            || data->type == it8720
            || data->type == it8721
-           || data->type == it8728;
+           || data->type == it8728
+           || data->type == it8783;
 }
 
 static inline int has_old_autopwm(const struct it87_data *data)
@@ -1651,6 +1665,9 @@ static int __init it87_find(unsigned short *address,
        case IT8728F_DEVID:
                sio_data->type = it8728;
                break;
+       case IT8783E_DEVID:
+               sio_data->type = it8783;
+               break;
        case 0xffff:    /* No device at all */
                goto exit;
        default:
@@ -1686,6 +1703,60 @@ static int __init it87_find(unsigned short *address,
                /* The IT8705F has a different LD number for GPIO */
                superio_select(5);
                sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8783) {
+               int reg25, reg27, reg2A, reg2C, regEF;
+
+               sio_data->skip_vid = 1; /* No VID */
+
+               superio_select(GPIO);
+
+               reg25 = superio_inb(IT87_SIO_GPIO1_REG);
+               reg27 = superio_inb(IT87_SIO_GPIO3_REG);
+               reg2A = superio_inb(IT87_SIO_PINX1_REG);
+               reg2C = superio_inb(IT87_SIO_PINX2_REG);
+               regEF = superio_inb(IT87_SIO_SPI_REG);
+
+               /* Check if fan3 is there or not */
+               if ((reg27 & (1 << 0)) || !(reg2C & (1 << 2)))
+                       sio_data->skip_fan |= (1 << 2);
+               if ((reg25 & (1 << 4))
+                   || (!(reg2A & (1 << 1)) && (regEF & (1 << 0))))
+                       sio_data->skip_pwm |= (1 << 2);
+
+               /* Check if fan2 is there or not */
+               if (reg27 & (1 << 7))
+                       sio_data->skip_fan |= (1 << 1);
+               if (reg27 & (1 << 3))
+                       sio_data->skip_pwm |= (1 << 1);
+
+               /* VIN5 */
+               if ((reg27 & (1 << 0)) || (reg2C & (1 << 2)))
+                       ; /* No VIN5 */
+
+               /* VIN6 */
+               if ((reg27 & (1 << 1)) || (reg2C & (1 << 2)))
+                       ; /* No VIN6 */
+
+               /* VIN7 */
+               if ((reg27 & (1 << 2)) || (reg2C & (1 << 2))) {
+                       /*
+                        * If the external VIN7 pin is disabled, route it to the
+                        * internal VCCH5V if that is not already done.
+                        */
+                       if (!(reg2C & (1 << 1))) {
+                               reg2C |= (1 << 1);
+                               superio_outb(IT87_SIO_PINX2_REG, reg2C);
+                               pr_notice("Routing internal VCCH to in7\n");
+                       }
+               }
+
+               if (reg2C & (1 << 0))
+                       sio_data->internal |= (1 << 0);
+               if (reg2C & (1 << 1))
+                       sio_data->internal |= (1 << 1);
+
+               sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
+
        } else {
                int reg;
 
@@ -1694,8 +1765,8 @@ static int __init it87_find(unsigned short *address,
                reg = superio_inb(IT87_SIO_GPIO3_REG);
                if (sio_data->type == it8721 || sio_data->type == it8728) {
                        /*
-                        * The IT8721F/IT8758E doesn't have VID pins at all,
-                        * not sure about the IT8728F.
+                        * The IT8721F/IT8758E/IT8783E/F don't have VID pins
+                        * at all, not sure about the IT8728F.
                         */
                        sio_data->skip_vid = 1;
                } else {
@@ -1867,6 +1938,11 @@ static int __devinit it87_probe(struct platform_device *pdev)
                        data->in_scaled |= (1 << 7);    /* in7 is VSB */
                if (sio_data->internal & (1 << 2))
                        data->in_scaled |= (1 << 8);    /* in8 is Vbat */
+       } else if (sio_data->type == it8783) {
+               if (sio_data->internal & (1 << 0))
+                       data->in_scaled |= (1 << 3);    /* in3 is VCC5V */
+               if (sio_data->internal & (1 << 1))
+                       data->in_scaled |= (1 << 7);    /* in7 is VCCH5V */
        }
 
        /* Initialize the IT87 chip */