Revert "Provide vid_from_reg and vid_which_vrm if needed"

[groeck-it87] / it87.c

diff --git a/it87.c b/it87.c
index d82bd5fcbc2b8f94c62d36f269d369ea6ad3b871..ca687886a7f5258b41caa8631cb19c0976cca2fa 100644 (file)
--- a/it87.c
+++ b/it87.c
@@ -31,6 +31,8 @@
  *            IT8726F  Super I/O chip w/LPC interface
  *            IT8728F  Super I/O chip w/LPC interface
  *            IT8732F  Super I/O chip w/LPC interface
+ *            IT8736F  Super I/O chip w/LPC interface
+ *            IT8738E  Super I/O chip w/LPC interface
  *            IT8758E  Super I/O chip w/LPC interface
  *            IT8771E  Super I/O chip w/LPC interface
  *            IT8772E  Super I/O chip w/LPC interface
@@ -83,6 +85,7 @@
 #define DRVNAME "it87"
 
 enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8732,
+            it8736, it8738,
             it8771, it8772, it8781, it8782, it8783, it8786, it8790,
             it8792, it8603, it8606, it8607, it8613, it8620, it8622, it8625,
             it8628, it8655, it8665, it8686 };
@@ -179,6 +182,8 @@ static inline void superio_exit(int ioreg, bool doexit)
 #define IT8726F_DEVID 0x8726
 #define IT8728F_DEVID 0x8728
 #define IT8732F_DEVID 0x8732
+#define IT8736F_DEVID 0x8736
+#define IT8738E_DEVID 0x8738
 #define IT8792E_DEVID 0x8733
 #define IT8771E_DEVID 0x8771
 #define IT8772E_DEVID 0x8772
@@ -466,13 +471,40 @@ static const struct it87_devices it87_devices[] = {
                .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
                  | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
                  | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FOUR_FANS
-                 | FEAT_FOUR_PWM | FEAT_FANCTL_ONOFF,
+                 | FEAT_FOUR_PWM | FEAT_FANCTL_ONOFF | FEAT_SCALING,
                .num_temp_limit = 3,
                .num_temp_offset = 3,
                .num_temp_map = 3,
                .peci_mask = 0x07,
                .old_peci_mask = 0x02,  /* Actually reports PCH */
        },
+       [it8736] = {
+               .name = "it8736",
+               .model = "IT8736F",
+               .features = FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
+                 | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FOUR_FANS
+                 | FEAT_FANCTL_ONOFF | FEAT_SCALING,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+               .old_peci_mask = 0x02,  /* Actually reports PCH */
+       },
+       [it8738] = {
+               .name = "it8738",
+               .model = "IT8738E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
+                 | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL
+                 | FEAT_FANCTL_ONOFF | FEAT_SCALING
+                 | FEAT_AVCC3,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+               .old_peci_mask = 0x02,
+       },
        [it8771] = {
                .name = "it8771",
                .model = "IT8771E",
@@ -772,6 +804,7 @@ struct it87_data {
        u8 old_peci_mask;
 
        u8 smbus_bitmap;        /* !=0 if SMBus needs to be disabled */
+       u8 saved_bank;          /* saved bank register value */
        u8 ec_special_config;   /* EC special config register restore value */
        u8 sioaddr;             /* SIO port address */
        bool doexit;            /* true if exit from sio config is ok */
@@ -962,6 +995,18 @@ static const unsigned int pwm_freq[8] = {
        750000,
 };
 
+static int _it87_io_read(struct it87_data *data, u16 reg)
+{
+       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
+       return inb_p(data->addr + IT87_DATA_REG_OFFSET);
+}
+
+static void _it87_io_write(struct it87_data *data, u16 reg, u8 value)
+{
+       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
+       outb_p(value, data->addr + IT87_DATA_REG_OFFSET);
+}
+
 static int smbus_disable(struct it87_data *data)
 {
        int err;
@@ -974,6 +1019,8 @@ static int smbus_disable(struct it87_data *data)
                superio_outb(data->sioaddr, IT87_SPECIAL_CFG_REG,
                             data->ec_special_config & ~data->smbus_bitmap);
                superio_exit(data->sioaddr, data->doexit);
+               if (has_bank_sel(data) && !data->mmio)
+                       data->saved_bank = _it87_io_read(data, IT87_REG_BANK);
        }
        return 0;
 }
@@ -983,6 +1030,8 @@ static int smbus_enable(struct it87_data *data)
        int err;
 
        if (data->smbus_bitmap) {
+               if (has_bank_sel(data) && !data->mmio)
+                       _it87_io_write(data, IT87_REG_BANK, data->saved_bank);
                err = superio_enter(data->sioaddr);
                if (err)
                        return err;
@@ -995,18 +1044,6 @@ static int smbus_enable(struct it87_data *data)
        return 0;
 }
 
-static int _it87_io_read(struct it87_data *data, u16 reg)
-{
-       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
-       return inb_p(data->addr + IT87_DATA_REG_OFFSET);
-}
-
-static void _it87_io_write(struct it87_data *data, u16 reg, u8 value)
-{
-       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
-       outb_p(value, data->addr + IT87_DATA_REG_OFFSET);
-}
-
 static u8 it87_io_set_bank(struct it87_data *data, u8 bank)
 {
        u8 _bank = bank;
@@ -3007,6 +3044,12 @@ static int __init it87_find(int sioaddr, unsigned short *address,
        case IT8732F_DEVID:
                sio_data->type = it8732;
                break;
+       case IT8736F_DEVID:
+               sio_data->type = it8736;
+               break;
+       case IT8738E_DEVID:
+               sio_data->type = it8738;
+               break;
        case IT8792E_DEVID:
                sio_data->type = it8792;
                /*
@@ -3378,7 +3421,8 @@ static int __init it87_find(int sioaddr, unsigned short *address,
 
                sio_data->beep_pin = superio_inb(sioaddr,
                                                 IT87_SIO_BEEP_PIN_REG) & 0x3f;
-       } else if (sio_data->type == it8732) {
+       } else if (sio_data->type == it8732 || sio_data->type == it8736 ||
+                  sio_data->type == it8738) {
                int reg;
 
                superio_select(sioaddr, GPIO);
@@ -3400,9 +3444,11 @@ static int __init it87_find(int sioaddr, unsigned short *address,
                        sio_data->skip_fan |= BIT(3);
 
                /* Check if AVCC is on VIN3 */
-               reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
-               if (reg & BIT(0))
-                       sio_data->internal |= BIT(0);
+               if (sio_data->type != it8738) {
+                       reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
+                       if (reg & BIT(0))
+                               sio_data->internal |= BIT(0);
+               }
 
                sio_data->beep_pin = superio_inb(sioaddr,
                                                 IT87_SIO_BEEP_PIN_REG) & 0x3f;