redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

hwmon: (it87) Add feature flags for fans count and 16-bit fan configuration 

Fans 4-5 are not supported on all chips and revisions. Also, 16-bit fan
counters are always enabled on some chips. Provide feature flags to
simplify adding support for new chips.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
hifive-unleashed-5.1
Guenter Roeck 2015-02-12 07:11:38 -08:00
parent fd044868e8
commit 9faf28ca4b
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/hwmon/it87.c
View File

@ -252,6 +252,8 @@ struct it87_devices {
#define FEAT_TEMP_OFFSET (1 << 4) #define FEAT_TEMP_OFFSET (1 << 4)
#define FEAT_TEMP_PECI (1 << 5) #define FEAT_TEMP_PECI (1 << 5)
#define FEAT_TEMP_OLD_PECI (1 << 6) #define FEAT_TEMP_OLD_PECI (1 << 6)
#define FEAT_FAN16_CONFIG (1 << 7) /* Need to enable 16-bit fans */
#define FEAT_FIVE_FANS (1 << 8) /* Supports five fans */
static const struct it87_devices it87_devices[] = { static const struct it87_devices it87_devices[] = {
[it87] = { [it87] = {
@ -264,67 +266,71 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8716] = { [it8716] = {
.name = "it8716", .name = "it8716",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET, .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_FAN16_CONFIG | FEAT_FIVE_FANS,
}, },
[it8718] = { [it8718] = {
.name = "it8718", .name = "it8718",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8720] = { [it8720] = {
.name = "it8720", .name = "it8720",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8721] = { [it8721] = {
.name = "it8721", .name = "it8721",
.features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
| FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI, | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
| FEAT_FAN16_CONFIG | FEAT_FIVE_FANS,
.peci_mask = 0x05, .peci_mask = 0x05,
.old_peci_mask = 0x02, /* Actually reports PCH */ .old_peci_mask = 0x02, /* Actually reports PCH */
}, },
[it8728] = { [it8728] = {
.name = "it8728", .name = "it8728",
.features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
| FEAT_TEMP_OFFSET | FEAT_TEMP_PECI, | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_FIVE_FANS,
.peci_mask = 0x07, .peci_mask = 0x07,
}, },
[it8771] = { [it8771] = {
.name = "it8771", .name = "it8771",
.features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
| FEAT_TEMP_OFFSET | FEAT_TEMP_PECI, | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI,
/* PECI: guesswork */ /* PECI: guesswork */
/* 12mV ADC (OHM) */ /* 12mV ADC (OHM) */
/* 16 bit fans (OHM) */ /* 16 bit fans (OHM) */
/* three fans, always 16 bit (guesswork) */
.peci_mask = 0x07, .peci_mask = 0x07,
}, },
[it8772] = { [it8772] = {
.name = "it8772", .name = "it8772",
.features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
| FEAT_TEMP_OFFSET | FEAT_TEMP_PECI, | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI,
/* PECI (coreboot) */ /* PECI (coreboot) */
/* 12mV ADC (HWSensors4, OHM) */ /* 12mV ADC (HWSensors4, OHM) */
/* 16 bit fans (HWSensors4, OHM) */ /* 16 bit fans (HWSensors4, OHM) */
/* three fans, always 16 bit (datasheet) */
.peci_mask = 0x07, .peci_mask = 0x07,
}, },
[it8781] = { [it8781] = {
.name = "it8781", .name = "it8781",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8782] = { [it8782] = {
.name = "it8782", .name = "it8782",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8783] = { [it8783] = {
.name = "it8783", .name = "it8783",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8603] = { [it8603] = {
@ -345,6 +351,8 @@ static const struct it87_devices it87_devices[] = {
#define has_temp_old_peci(data, nr) \ #define has_temp_old_peci(data, nr) \
(((data)->features & FEAT_TEMP_OLD_PECI) && \ (((data)->features & FEAT_TEMP_OLD_PECI) && \
((data)->old_peci_mask & (1 << nr))) ((data)->old_peci_mask & (1 << nr)))
#define has_fan16_config(data) ((data)->features & FEAT_FAN16_CONFIG)
#define has_five_fans(data) ((data)->features & FEAT_FIVE_FANS)
struct it87_sio_data { struct it87_sio_data {
enum chips type; enum chips type;
@ -2124,13 +2132,14 @@ static int it87_probe(struct platform_device *pdev)
case it87: case it87:
if (sio_data->revision >= 0x03) { if (sio_data->revision >= 0x03) {
data->features &= ~FEAT_OLD_AUTOPWM; data->features &= ~FEAT_OLD_AUTOPWM;
data->features |= FEAT_16BIT_FANS; data->features |= FEAT_FAN16_CONFIG | FEAT_16BIT_FANS;
} }
break; break;
case it8712: case it8712:
if (sio_data->revision >= 0x08) { if (sio_data->revision >= 0x08) {
data->features &= ~FEAT_OLD_AUTOPWM; data->features &= ~FEAT_OLD_AUTOPWM;
data->features |= FEAT_16BIT_FANS; data->features |= FEAT_FAN16_CONFIG | FEAT_16BIT_FANS |
FEAT_FIVE_FANS;
} }
break; break;
default: default:
@ -2463,12 +2472,8 @@ static void it87_init_device(struct platform_device *pdev)
} }
data->has_fan = (data->fan_main_ctrl >> 4) & 0x07; data->has_fan = (data->fan_main_ctrl >> 4) & 0x07;
/* /* Set tachometers to 16-bit mode if needed */
* Set tachometers to 16-bit mode if needed. IT8603E, IT8728F, if (has_fan16_config(data)) {
* IT8771E (guesswork), and IT8772E have it by default.
*/
if (has_16bit_fans(data) && data->type != it8603 && data->type != it8728
&& data->type != it8771 && data->type != it8772) {
tmp = it87_read_value(data, IT87_REG_FAN_16BIT); tmp = it87_read_value(data, IT87_REG_FAN_16BIT);
if (~tmp & 0x07 & data->has_fan) { if (~tmp & 0x07 & data->has_fan) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
@ -2476,17 +2481,15 @@ static void it87_init_device(struct platform_device *pdev)
it87_write_value(data, IT87_REG_FAN_16BIT, it87_write_value(data, IT87_REG_FAN_16BIT,
tmp | 0x07); tmp | 0x07);
} }
/* }
* IT8705F, IT8781F, IT8782F, and IT8783E/F only support
* three fans. /* Check for additional fans */
*/ if (has_five_fans(data)) {
if (data->type != it87 && data->type != it8781 && tmp = it87_read_value(data, IT87_REG_FAN_16BIT);
data->type != it8782 && data->type != it8783) { if (tmp & (1 << 4))
if (tmp & (1 << 4)) data->has_fan |= (1 << 3); /* fan4 enabled */
data->has_fan |= (1 << 3); /* fan4 enabled */ if (tmp & (1 << 5))
if (tmp & (1 << 5)) data->has_fan |= (1 << 4); /* fan5 enabled */
data->has_fan |= (1 << 4); /* fan5 enabled */
}
} }
/* Fan input pins may be used for alternative functions */ /* Fan input pins may be used for alternative functions */