hwmon: (it87) Add feature flag indicating that VIN3 is connected to 5V
Subsystems (2)
Guenter Roeck
maintainerPATCH 1/7 hwmon: (it87) Add feature flag indicating that VIN3 is connected to 5V
On IT8622E and IT8628E, VIN3 is expected to be connected to +5V. Add feature flag and reflect in input label.
--- drivers/hwmon/it87.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/hwmon/it87.c +4 -2
@@ -296,6 +296,7 @@ struct it87_devices {#define FEAT_SIX_PWM BIT(14)/* Chip supports 6 pwm chn */ #define FEAT_PWM_FREQ2 BIT(15)/* Separate pwm freq 2 */ #define FEAT_SIX_TEMP BIT(16)/* Up to 6 temp sensors */ +#define FEAT_VIN3_5V BIT(17)/* VIN3 connected to +5V */ static const struct it87_devices it87_devices[] = { [it87] = {
@@ -433,7 +434,7 @@ static const struct it87_devices it87_devices[] = { .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS |FEAT_TEMP_OFFSET |FEAT_TEMP_PECI |FEAT_SIX_FANS |FEAT_IN7_INTERNAL |FEAT_SIX_PWM |FEAT_PWM_FREQ2 - | FEAT_SIX_TEMP, + | FEAT_SIX_TEMP | FEAT_VIN3_5V, .peci_mask = 0x07, }, [it8628] = {
@@ -442,7 +443,7 @@ static const struct it87_devices it87_devices[] = { .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS |FEAT_TEMP_OFFSET |FEAT_TEMP_PECI |FEAT_SIX_FANS |FEAT_IN7_INTERNAL |FEAT_SIX_PWM |FEAT_PWM_FREQ2 - | FEAT_SIX_TEMP, + | FEAT_SIX_TEMP | FEAT_VIN3_5V, .peci_mask = 0x07, }, };
@@ -468,6 +469,7 @@ static const struct it87_devices it87_devices[] = {#define has_six_pwm (data) ((data)->features & FEAT_SIX_PWM)#define has_pwm_freq2 (data) ((data)->features & FEAT_PWM_FREQ2)#define has_six_temp (data) ((data)->features & FEAT_SIX_TEMP) +#define has_vin3_5v (data) ((data)->features & FEAT_VIN3_5V)struct it87_sio_data {enum chips type;
@@ -1926,7 +1928,9 @@ static ssize_t show_label(struct device *dev, struct
device_attribute *attr,
int nr = to_sensor_dev_attr(attr)->index;
const char *label;- if (has_12mv_adc(data) || has_10_9mv_adc(data))
+ if (has_vin3_5v(data) && nr == 0)
+ label = labels[0];
+ else if (has_12mv_adc(data) || has_10_9mv_adc(data))
label = labels_it8721[nr];
else
label = labels[nr];Signature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Guenter Roeck
maintainerPATCH 2/7 hwmon: (it87) Add support for IT8622E
IT8622E is similar to IT8620E, but only supports five pwm controls and five fan tachometers.
Originally-from: Kevin Folz <[email protected]>.
--- drivers/hwmon/it87.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/hwmon/it87.c +12 -1
@@ -12,6 +12,7 @@* * Supports: IT8603E Super I/O chip w/LPC interface * IT8620E Super I/O chip w/LPC interface +* IT8622E Super I/O chip w/LPC interface * IT8623E Super I/O chip w/LPC interface * IT8628E Super I/O chip w/LPC interface * IT8705F Super I/O chip w/LPC interface
@@ -70,7 +71,7 @@enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8732, it8771, it8772, it8781, it8782, it8783, it8786, it8790, it8603, - it8620, it8628 }; + it8620, it8622, it8628 };static unsigned short force_id;module_param (force_id, ushort,0 );
@@ -160,6 +161,7 @@ static inline void superio_exit(int ioreg)#define IT8790E_DEVID 0x8790#define IT8603E_DEVID 0x8603#define IT8620E_DEVID 0x8620 +#define IT8622E_DEVID 0x8622#define IT8623E_DEVID 0x8623#define IT8628E_DEVID 0x8628#define IT87_ACT_REG 0x30
@@ -437,6 +439,15 @@ static const struct it87_devices it87_devices[] = { | FEAT_SIX_TEMP | FEAT_VIN3_5V, .peci_mask = 0x07, }, + [it8622] = { + .name = "it8622", + .suffix = "E", + .features =FEAT_NEWER_AUTOPWM |FEAT_12MV_ADC |FEAT_16BIT_FANS + |FEAT_TEMP_OFFSET |FEAT_TEMP_PECI |FEAT_FIVE_FANS + |FEAT_IN7_INTERNAL |FEAT_PWM_FREQ2 |FEAT_AVCC3 + | FEAT_VIN3_5V, + .peci_mask = 0x07, + }, [it8628] = { .name = "it8628", .suffix = "E",
@@ -2418,6 +2429,9 @@ static int __init it87_find(int sioaddr, unsigned short
*address,
case IT8620E_DEVID:
sio_data->type = it8620;
break;
+ case IT8622E_DEVID:
+ sio_data->type = it8622;
+ break;
case IT8628E_DEVID:
sio_data->type = it8628;
break;Signature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Guenter Roeck
maintainerPATCH 3/7 hwmon: (it87) Improve IT8622 support
In reply to Guenter RoeckConfiguration registers on ITE8622 are different to 8620 and 8628 and require special handling. Also, the chip supports up to 5 pwm controls.
--- drivers/hwmon/it87.c | 67 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 8 deletions(-)
drivers/hwmon/it87.c +9 -6
@@ -295,10 +295,11 @@ struct it87_devices {#define FEAT_SIX_FANS BIT(11)/* Supports six fans */ #define FEAT_10_9MV_ADC BIT(12)#define FEAT_AVCC3 BIT(13)/* Chip supports in9/AVCC3 */ -#define FEAT_SIX_PWM BIT(14)/* Chip supports 6 pwm chn */ -#define FEAT_PWM_FREQ2 BIT(15)/* Separate pwm freq 2 */ -#define FEAT_SIX_TEMP BIT(16)/* Up to 6 temp sensors */ -#define FEAT_VIN3_5V BIT(17)/* VIN3 connected to +5V */ +#define FEAT_FIVE_PWM BIT(14)/* Chip supports 5 pwm chn */ +#define FEAT_SIX_PWM BIT(15)/* Chip supports 6 pwm chn */ +#define FEAT_PWM_FREQ2 BIT(16)/* Separate pwm freq 2 */ +#define FEAT_SIX_TEMP BIT(17)/* Up to 6 temp sensors */ +#define FEAT_VIN3_5V BIT(18)/* VIN3 connected to +5V */ static const struct it87_devices it87_devices[] = { [it87] = {
@@ -444,8 +445,8 @@ static const struct it87_devices it87_devices[] = { .suffix = "E", .features =FEAT_NEWER_AUTOPWM |FEAT_12MV_ADC |FEAT_16BIT_FANS |FEAT_TEMP_OFFSET |FEAT_TEMP_PECI |FEAT_FIVE_FANS - |FEAT_IN7_INTERNAL |FEAT_PWM_FREQ2 |FEAT_AVCC3 - | FEAT_VIN3_5V, + |FEAT_FIVE_PWM |FEAT_IN7_INTERNAL |FEAT_PWM_FREQ2 + | FEAT_AVCC3 | FEAT_VIN3_5V, .peci_mask = 0x07, }, [it8628] = {
@@ -477,6 +478,8 @@ static const struct it87_devices it87_devices[] = {#define has_in7_internal (data) ((data)->features & FEAT_IN7_INTERNAL)#define has_six_fans (data) ((data)->features & FEAT_SIX_FANS)#define has_avcc3 (data) ((data)->features & FEAT_AVCC3) +#define has_five_pwm (data) ((data)->features & (FEAT_FIVE_PWM \ + | FEAT_SIX_PWM))#define has_six_pwm (data) ((data)->features & FEAT_SIX_PWM)#define has_pwm_freq2 (data) ((data)->features & FEAT_PWM_FREQ2)#define has_six_temp (data) ((data)->features & FEAT_SIX_TEMP)
@@ -1929,11 +1932,13 @@ static ssize_t show_label(struct device *dev, struct
device_attribute *attr,
"+5V",
"5VSB",
"Vbat",
+ "AVCC",
};
static const char * const labels_it8721[] = {
"+3.3V",
"3VSB",
"Vbat",
+ "+3.3V",
};
struct it87_data *data = dev_get_drvdata(dev);
int nr = to_sensor_dev_attr(attr)->index;@@ -1952,7 +1957,7 @@ static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 0);
static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 1); static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 2); /* AVCC3 */
-static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 0); +static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 3);
static umode_t it87_in_is_visible(struct kobject *kobj,
struct attribute *attr, int index)
@@ -2475,8 +2480,10 @@ static int __init it87_find(int sioaddr, unsigned short *address,
else
sio_data->skip_in |= BIT(9);- if (!has_six_pwm(config))
+ if (!has_five_pwm(config))
sio_data->skip_pwm |= BIT(3) | BIT(4) | BIT(5);
+ else if (!has_six_pwm(config))
+ sio_data->skip_pwm |= BIT(5);
if (!has_vid(config))
sio_data->skip_vid = 1;
@@ -2620,6 +2627,50 @@ static int __init it87_find(int sioaddr, unsigned short
*address,
sio_data->skip_fan |= BIT(5);
}+ /* Check if AVCC is on VIN3 */ + reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG); + if (reg & BIT(0))
+ sio_data->internal |= BIT(0);
+ else
+ sio_data->skip_in |= BIT(9);
+
+ sio_data->beep_pin = superio_inb(sioaddr,
+ IT87_SIO_BEEP_PIN_REG) & 0x3f;
+ } else if (sio_data->type == it8622) {
+ int reg;
+
+ superio_select(sioaddr, GPIO);
+
+ /* Check for pwm4, fan4 */ + reg = superio_inb(sioaddr, IT87_SIO_GPIO1_REG); + if (reg & BIT(6))
+ sio_data->skip_fan |= BIT(3);
+ if (reg & BIT(5))
+ sio_data->skip_pwm |= BIT(3);
+
+ /* Check for pwm3, fan3, pwm5, fan5 */ + reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG); + if (reg & BIT(6))
+ sio_data->skip_pwm |= BIT(2);
+ if (reg & BIT(7))
+ sio_data->skip_fan |= BIT(2);
+ if (reg & BIT(3))
+ sio_data->skip_pwm |= BIT(4);
+ if (reg & BIT(1))
+ sio_data->skip_fan |= BIT(4);
+
+ /* Check for pwm2, fan2 */ + reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG); + if (reg & BIT(1))
+ sio_data->skip_pwm |= BIT(1);
+ if (reg & BIT(2))
+ sio_data->skip_fan |= BIT(1);
+
+ /* Check for AVCC */
+ reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
+ if (!(reg & BIT(0)))
+ sio_data->skip_in |= BIT(9);
+
sio_data->beep_pin = superio_inb(sioaddr,
IT87_SIO_BEEP_PIN_REG) & 0x3f;
} else {Signature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html