]> git.sur5r.net Git - groeck-it87/blobdiff - it87.c
projects / groeck-it87 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #27 from jmaggard10/master
[groeck-it87] / it87.c
diff --git a/it87.c b/it87.c
index bde1e051fcc4e4c3c9b5813f78fd1c3515ec40f7..a489cab422d42bcd7f4ece4ed9a9f01b018f63bb 100644 (file)
--- a/it87.c
+++ b/it87.c
@@ -16,6 +16,7 @@
  *            IT8620E  Super I/O chip w/LPC interface
  *            IT8622E  Super I/O chip w/LPC interface
  *            IT8623E  Super I/O chip w/LPC interface
+ *            IT8625E  Super I/O chip w/LPC interface
  *            IT8628E  Super I/O chip w/LPC interface
  *            IT8655E  Super I/O chip w/LPC interface
  *            IT8665E  Super I/O chip w/LPC interface
@@ -81,8 +82,8 @@
 
 enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8732,
             it8771, it8772, it8781, it8782, it8783, it8786, it8790,
-            it8792, it8603, it8607, it8613, it8620, it8622, it8628, it8655,
-            it8665, it8686 };
+            it8792, it8603, it8607, it8613, it8620, it8622, it8625, it8628,
+            it8655, it8665, it8686 };
 
 static unsigned short force_id;
 module_param(force_id, ushort, 0);
@@ -215,6 +216,7 @@ static inline void superio_exit(int ioreg)
 #define IT8620E_DEVID 0x8620
 #define IT8622E_DEVID 0x8622
 #define IT8623E_DEVID 0x8623
+#define IT8625E_DEVID 0x8625
 #define IT8628E_DEVID 0x8628
 #define IT8655E_DEVID 0x8655
 #define IT8665E_DEVID 0x8665
@@ -386,6 +388,7 @@ struct it87_devices {
 #define FEAT_SCALING           BIT(22) /* Internal voltage scaling */
 #define FEAT_FANCTL_ONOFF      BIT(23) /* chip has FAN_CTL ON/OFF */
 #define FEAT_11MV_ADC          BIT(24)
+#define FEAT_NEW_TEMPMAP       BIT(25) /* new temp input selection */
 
 static const struct it87_devices it87_devices[] = {
        [it87] = {
@@ -559,16 +562,16 @@ static const struct it87_devices it87_devices[] = {
                .num_temp_limit = 3,
                .peci_mask = 0x07,
        },
-        [it8613] = {
-                .name = "it8613",
-                .suffix = "E",
-                .features = FEAT_NEWER_AUTOPWM | FEAT_11MV_ADC | FEAT_16BIT_FANS
-                  | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_FIVE_FANS
-                  | FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2
-                  | FEAT_AVCC3 | FEAT_SCALING,
-                .num_temp_limit = 6,
-                .peci_mask = 0x07,
-        },
+       [it8613] = {
+               .name = "it8613",
+               .suffix = "E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_11MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_FIVE_FANS
+                 | FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2
+                 | FEAT_AVCC3 | FEAT_SCALING | FEAT_NEW_TEMPMAP,
+               .num_temp_limit = 6,
+               .peci_mask = 0x07,
+       },
        [it8620] = {
                .name = "it8620",
                .suffix = "E",
@@ -590,6 +593,15 @@ static const struct it87_devices it87_devices[] = {
                .num_temp_limit = 3,
                .peci_mask = 0x07,
        },
+       [it8625] = {
+               .name = "it8625",
+               .suffix = "E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
+                 | FEAT_TEMP_OFFSET | FEAT_AVCC3 | FEAT_NEW_TEMPMAP
+                 | FEAT_11MV_ADC | FEAT_IN7_INTERNAL | FEAT_SIX_FANS
+                 | FEAT_SIX_PWM | FEAT_BANK_SEL | FEAT_SCALING,
+               .num_temp_limit = 6,
+       },
        [it8628] = {
                .name = "it8628",
                .suffix = "E",
@@ -605,7 +617,7 @@ static const struct it87_devices it87_devices[] = {
                .name = "it8655",
                .suffix = "E",
                .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_AVCC3
+                 | FEAT_TEMP_OFFSET | FEAT_AVCC3 | FEAT_NEW_TEMPMAP
                  | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_BANK_SEL,
                .num_temp_limit = 6,
        },
@@ -613,7 +625,7 @@ static const struct it87_devices it87_devices[] = {
                .name = "it8665",
                .suffix = "E",
                .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_AVCC3
+                 | FEAT_TEMP_OFFSET | FEAT_AVCC3 | FEAT_NEW_TEMPMAP
                  | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_SIX_FANS
                  | FEAT_SIX_PWM | FEAT_BANK_SEL,
                .num_temp_limit = 6,
@@ -622,7 +634,7 @@ static const struct it87_devices it87_devices[] = {
                .name = "it8686",
                .suffix = "E",
                .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_SIX_FANS
+                 | FEAT_TEMP_OFFSET | FEAT_SIX_FANS | FEAT_NEW_TEMPMAP
                  | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2
                  | FEAT_SIX_TEMP | FEAT_BANK_SEL | FEAT_SCALING | FEAT_AVCC3,
                .num_temp_limit = 6,
@@ -663,6 +675,7 @@ static const struct it87_devices it87_devices[] = {
 #define has_scaling(data)      ((data)->features & FEAT_SCALING)
 #define has_fanctl_onoff(data) ((data)->features & FEAT_FANCTL_ONOFF)
 #define has_11mv_adc(data)     ((data)->features & FEAT_11MV_ADC)
+#define has_new_tempmap(data)  ((data)->features & FEAT_NEW_TEMPMAP)
 
 struct it87_sio_data {
        enum chips type;
@@ -900,7 +913,7 @@ static void it87_update_pwm_ctrl(struct it87_data *data, int nr)
 {
        data->pwm_ctrl[nr] = it87_read_value(data, data->REG_PWM[nr]);
        if (has_newer_autopwm(data)) {
-               if (data->type == it8613)
+               if (has_new_tempmap(data))
                        data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x38;
                else
                        data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03;
@@ -1281,6 +1294,9 @@ static int get_temp_type(struct it87_data *data, int index)
                                break;
                        }
                        break;
+               case it8625:
+                       if (index < 3)
+                               break;
                case it8655:
                case it8665:
                        if (src1 < 3) {
@@ -1754,9 +1770,9 @@ static ssize_t show_pwm_temp_map(struct device *dev,
        int map;
 
        map = data->pwm_temp_map[nr];
-       if (data->type == it8613) {
+       if (has_new_tempmap(data)) {
                map >>= 3;
-               if (map >= 7)
+               if (map >= 6)
                        map = 0;        /* Should never happen */
        } else {
                if (map >= 3)
@@ -1781,7 +1797,7 @@ static ssize_t set_pwm_temp_map(struct device *dev,
        if (kstrtol(buf, 10, &val) < 0)
                return -EINVAL;
 
-       if (nr >= 3 && data->type != it8613)
+       if (nr >= 3 && !has_new_tempmap(data))
                val -= 3;
 
        switch (val) {
@@ -1803,14 +1819,14 @@ static ssize_t set_pwm_temp_map(struct device *dev,
        case BIT(5):
                reg = 0x05;
                break;
-       case BIT(5) | BIT(6):
+       case BIT(6):
                reg = 0x06;
                break;
        default:
                return -EINVAL;
        }
 
-       if (data->type == it8613)
+       if (has_new_tempmap(data))
                reg <<= 3;
        else if (reg > 0x02)
                return -EINVAL;
@@ -1823,7 +1839,9 @@ static ssize_t set_pwm_temp_map(struct device *dev,
         * otherwise, just store it for later use.
         */
        if (data->pwm_ctrl[nr] & 0x80) {
-               data->pwm_ctrl[nr] = (data->pwm_ctrl[nr] & 0xfc) |
+               u8 mask = has_new_tempmap(data) ? 0xc7 : 0xfc;
+
+               data->pwm_ctrl[nr] = (data->pwm_ctrl[nr] & mask) |
                                                data->pwm_temp_map[nr];
                it87_write_value(data, data->REG_PWM[nr], data->pwm_ctrl[nr]);
        }
@@ -2823,14 +2841,17 @@ static int __init it87_find(int sioaddr, unsigned short *address,
                sio_data->type = it8607;
                break;
        case IT8613E_DEVID:
-                sio_data->type = it8613;
-                break;
+               sio_data->type = it8613;
+               break;
        case IT8620E_DEVID:
                sio_data->type = it8620;
                break;
        case IT8622E_DEVID:
                sio_data->type = it8622;
                break;
+       case IT8625E_DEVID:
+               sio_data->type = it8625;
+               break;
        case IT8628E_DEVID:
                sio_data->type = it8628;
                break;
@@ -3174,44 +3195,57 @@ 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 == it8665) {
-               int reg;
+       } else if (sio_data->type == it8665 || sio_data->type == it8625) {
+               int reg27, reg29, reg2d, regd3;
 
                superio_select(sioaddr, GPIO);
 
-               /* Check for pwm2 */
-               reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
-               if (reg & BIT(1))
-                       sio_data->skip_pwm |= BIT(1);
+               reg27 = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               reg29 = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               reg2d = superio_inb(sioaddr, IT87_SIO_PINX4_REG);
+               regd3 = superio_inb(sioaddr, IT87_SIO_GPIO9_REG);
 
-               /* Check for fan2 */
-               reg = superio_inb(sioaddr, IT87_SIO_PINX4_REG);
-               if (reg & BIT(4))
+               /* Check for pwm2, fan2 */
+               if (reg29 & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+               if (reg2d & BIT(4))
                        sio_data->skip_fan |= BIT(1);
 
                /* Check for pwm3, fan3 */
-               reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
-               if (reg & BIT(6))
+               if (reg27 & BIT(6))
                        sio_data->skip_pwm |= BIT(2);
-               if (reg & BIT(7))
+               if (reg27 & BIT(7))
                        sio_data->skip_fan |= BIT(2);
 
-               /* Check for pwm5, fan5 */
-               reg = superio_inb(sioaddr, IT87_SIO_GPIO2_REG);
-               if (reg & BIT(5))
-                       sio_data->skip_pwm |= BIT(4);
-               if (!(reg & BIT(4)))
-                       sio_data->skip_fan |= BIT(4);
+               /* Check for pwm4, fan4, pwm5, fan5 */
+               if (sio_data->type == it8625) {
+                       int reg25 = superio_inb(sioaddr, IT87_SIO_GPIO1_REG);
+
+                       if (reg25 & BIT(6))
+                               sio_data->skip_fan |= BIT(3);
+                       if (reg25 & BIT(5))
+                               sio_data->skip_pwm |= BIT(3);
+                       if (reg27 & BIT(3))
+                               sio_data->skip_pwm |= BIT(4);
+                       if (reg27 & BIT(1))
+                               sio_data->skip_fan |= BIT(4);
+               } else {
+                       int reg26 = superio_inb(sioaddr, IT87_SIO_GPIO2_REG);
+
+                       if (regd3 & BIT(2))
+                               sio_data->skip_pwm |= BIT(3);
+                       if (regd3 & BIT(3))
+                               sio_data->skip_fan |= BIT(3);
+                       if (reg26 & BIT(5))
+                               sio_data->skip_pwm |= BIT(4);
+                       if (!(reg26 & BIT(4)))
+                               sio_data->skip_fan |= BIT(4);
+               }
 
-               /* Check for pwm4, fan4, pwm6, fan6 */
-               reg = superio_inb(sioaddr, IT87_SIO_GPIO9_REG);
-               if (reg & BIT(2))
-                       sio_data->skip_pwm |= BIT(3);
-               if (reg & BIT(3))
-                       sio_data->skip_fan |= BIT(3);
-               if (reg & BIT(0))
+               /* Check for pwm6, fan6 */
+               if (regd3 & BIT(0))
                        sio_data->skip_pwm |= BIT(5);
-               if (reg & BIT(1))
+               if (regd3 & BIT(1))
                        sio_data->skip_fan |= BIT(5);
 
                sio_data->beep_pin = superio_inb(sioaddr,
@@ -3325,13 +3359,9 @@ exit:
        return err;
 }
 
-/* Called when we have found a new IT87. */
-static void it87_init_device(struct platform_device *pdev)
+static void it87_init_regs(struct platform_device *pdev)
 {
-       struct it87_sio_data *sio_data = dev_get_platdata(&pdev->dev);
        struct it87_data *data = platform_get_drvdata(pdev);
-       int tmp, i;
-       u8 mask;
 
        /* Initialize chip specific register pointers */
        switch (data->type) {
@@ -3345,6 +3375,7 @@ static void it87_init_device(struct platform_device *pdev)
                data->REG_TEMP_LOW = IT87_REG_TEMP_LOW_8686;
                data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH_8686;
                break;
+       case it8625:
        case it8655:
        case it8665:
                data->REG_FAN = IT87_REG_FAN_8665;
@@ -3367,15 +3398,15 @@ static void it87_init_device(struct platform_device *pdev)
                data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
                break;
        case it8613:
-                data->REG_FAN = IT87_REG_FAN;
-                data->REG_FANX = IT87_REG_FANX;
-                data->REG_FAN_MIN = IT87_REG_FAN_MIN;
-                data->REG_FANX_MIN = IT87_REG_FANX_MIN;
-                data->REG_PWM = IT87_REG_PWM_8665;
-                data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET;
-                data->REG_TEMP_LOW = IT87_REG_TEMP_LOW;
-                data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
-                break;
+               data->REG_FAN = IT87_REG_FAN;
+               data->REG_FANX = IT87_REG_FANX;
+               data->REG_FAN_MIN = IT87_REG_FAN_MIN;
+               data->REG_FANX_MIN = IT87_REG_FANX_MIN;
+               data->REG_PWM = IT87_REG_PWM_8665;
+               data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET;
+               data->REG_TEMP_LOW = IT87_REG_TEMP_LOW;
+               data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
+               break;
        default:
                data->REG_FAN = IT87_REG_FAN;
                data->REG_FANX = IT87_REG_FANX;
@@ -3387,6 +3418,15 @@ static void it87_init_device(struct platform_device *pdev)
                data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
                break;
        }
+}
+
+/* Called when we have found a new IT87. */
+static void it87_init_device(struct platform_device *pdev)
+{
+       struct it87_sio_data *sio_data = dev_get_platdata(&pdev->dev);
+       struct it87_data *data = platform_get_drvdata(pdev);
+       int tmp, i;
+       u8 mask;
 
        /*
         * For each PWM channel:
@@ -3475,6 +3515,7 @@ static void it87_init_device(struct platform_device *pdev)
                        if (tmp & BIT(2))
                                data->has_fan |= BIT(5); /* fan6 enabled */
                        break;
+               case it8625:
                case it8665:
                        tmp = it87_read_value(data, IT87_REG_FAN_DIV);
                        if (tmp & BIT(3))
@@ -3628,6 +3669,9 @@ static int it87_probe(struct platform_device *pdev)
 
        mutex_init(&data->update_lock);
 
+       /* Initialize register pointers */
+       it87_init_regs(pdev);
+
        /* Check PWM configuration */
        enable_pwm_interface = it87_check_pwm(dev);
 
@@ -3816,6 +3860,13 @@ static const struct dmi_system_id it87_dmi_table[] __initconst = {
                },
                .driver_data = &gigabyte_ab350_gaming,
        },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Gigabyte Technology Co., Ltd."),
+                       DMI_MATCH(DMI_BOARD_NAME, "AX370-Gaming 5"),
+               },
+               .driver_data = &gigabyte_ab350_gaming,
+       },
        {
                .matches = {
                        DMI_MATCH(DMI_BOARD_VENDOR, "nVIDIA"),
Cloned from https://github.com/groeck/it87.git