Skip to content

L
linux
Commit 1f21531d authored by Frank Crawford's avatar Frank Crawford Committed by Guenter Roeck
Browse files
Options

hwmon: (it87) List full chip model name 

ITE model names do not always match the chip ID.

Convert from just adding a suffix to specifying the full model name.
Signed-off-by: default avatarFrank Crawford <frank@crawford.emu.id.au>
Link: https://lore.kernel.org/r/20230128060308.1549707-4-frank@crawford.emu.id.auSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent e1147378
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
drivers/hwmon/it87.c
View file @ 1f21531d
...@@ -277,7 +277,7 @@ static const u8 IT87_REG_AUTO_BASE[] = { 0x60, 0x68, 0x70, 0x78, 0xa0, 0xa8 }; ...@@ -277,7 +277,7 @@ static const u8 IT87_REG_AUTO_BASE[] = { 0x60, 0x68, 0x70, 0x78, 0xa0, 0xa8 };
struct it87_devices { struct it87_devices {
const char *name; const char *name;
const char * const suffix; const char * const model;
u32 features; u32 features;
u8 peci_mask; u8 peci_mask;
u8 old_peci_mask; u8 old_peci_mask;
...@@ -313,24 +313,24 @@ struct it87_devices { ...@@ -313,24 +313,24 @@ struct it87_devices {
static const struct it87_devices it87_devices[] = { static const struct it87_devices it87_devices[] = {
[it87] = { [it87] = {
.name = "it87", .name = "it87",
.suffix = "F", .model = "IT87F",
.features = FEAT_OLD_AUTOPWM, /* may need to overwrite */ .features = FEAT_OLD_AUTOPWM, /* may need to overwrite */
}, },
[it8712] = { [it8712] = {
.name = "it8712", .name = "it8712",
.suffix = "F", .model = "IT8712F",
.features = FEAT_OLD_AUTOPWM | FEAT_VID, .features = FEAT_OLD_AUTOPWM | FEAT_VID,
/* may need to overwrite */ /* may need to overwrite */
}, },
[it8716] = { [it8716] = {
.name = "it8716", .name = "it8716",
.suffix = "F", .model = "IT8716F",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID
| FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_PWM_FREQ2, | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_PWM_FREQ2,
}, },
[it8718] = { [it8718] = {
.name = "it8718", .name = "it8718",
.suffix = "F", .model = "IT8718F",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID
| FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS
| FEAT_PWM_FREQ2, | FEAT_PWM_FREQ2,
...@@ -338,7 +338,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -338,7 +338,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8720] = { [it8720] = {
.name = "it8720", .name = "it8720",
.suffix = "F", .model = "IT8720F",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET | FEAT_VID
| FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS
| FEAT_PWM_FREQ2, | FEAT_PWM_FREQ2,
...@@ -346,7 +346,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -346,7 +346,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8721] = { [it8721] = {
.name = "it8721", .name = "it8721",
.suffix = "F", .model = "IT8721F",
.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 | FEAT_IN7_INTERNAL | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_IN7_INTERNAL
...@@ -356,7 +356,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -356,7 +356,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8728] = { [it8728] = {
.name = "it8728", .name = "it8728",
.suffix = "F", .model = "IT8728F",
.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_FIVE_FANS | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_FIVE_FANS
| FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2, | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2,
...@@ -364,7 +364,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -364,7 +364,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8732] = { [it8732] = {
.name = "it8732", .name = "it8732",
.suffix = "F", .model = "IT8732F",
.features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
| FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
| FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL, | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL,
...@@ -373,7 +373,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -373,7 +373,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8771] = { [it8771] = {
.name = "it8771", .name = "it8771",
.suffix = "E", .model = "IT8771E",
.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_IN7_INTERNAL | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
| FEAT_PWM_FREQ2, | FEAT_PWM_FREQ2,
...@@ -385,7 +385,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -385,7 +385,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8772] = { [it8772] = {
.name = "it8772", .name = "it8772",
.suffix = "E", .model = "IT8772E",
.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_IN7_INTERNAL | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
| FEAT_PWM_FREQ2, | FEAT_PWM_FREQ2,
...@@ -397,28 +397,28 @@ static const struct it87_devices it87_devices[] = { ...@@ -397,28 +397,28 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8781] = { [it8781] = {
.name = "it8781", .name = "it8781",
.suffix = "F", .model = "IT8781F",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8782] = { [it8782] = {
.name = "it8782", .name = "it8782",
.suffix = "F", .model = "IT8782F",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8783] = { [it8783] = {
.name = "it8783", .name = "it8783",
.suffix = "E/F", .model = "IT8783E/F",
.features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
| FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2, | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8786] = { [it8786] = {
.name = "it8786", .name = "it8786",
.suffix = "E", .model = "IT8786E",
.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_IN7_INTERNAL | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
| FEAT_PWM_FREQ2, | FEAT_PWM_FREQ2,
...@@ -426,7 +426,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -426,7 +426,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8790] = { [it8790] = {
.name = "it8790", .name = "it8790",
.suffix = "E", .model = "IT8790E",
.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_IN7_INTERNAL | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
| FEAT_PWM_FREQ2 | FEAT_CONF_NOEXIT, | FEAT_PWM_FREQ2 | FEAT_CONF_NOEXIT,
...@@ -434,7 +434,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -434,7 +434,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8792] = { [it8792] = {
.name = "it8792", .name = "it8792",
.suffix = "E", .model = "IT8792E/IT8795E",
.features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
| FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
| FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_CONF_NOEXIT, | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_CONF_NOEXIT,
...@@ -443,7 +443,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -443,7 +443,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8603] = { [it8603] = {
.name = "it8603", .name = "it8603",
.suffix = "E", .model = "IT8603E",
.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_IN7_INTERNAL | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
| FEAT_AVCC3 | FEAT_PWM_FREQ2, | FEAT_AVCC3 | FEAT_PWM_FREQ2,
...@@ -451,7 +451,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -451,7 +451,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8620] = { [it8620] = {
.name = "it8620", .name = "it8620",
.suffix = "E", .model = "IT8620E",
.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_SIX_FANS | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_SIX_FANS
| FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2 | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2
...@@ -460,7 +460,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -460,7 +460,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8622] = { [it8622] = {
.name = "it8622", .name = "it8622",
.suffix = "E", .model = "IT8622E",
.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_FIVE_FANS | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_FIVE_FANS
| FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2
...@@ -469,7 +469,7 @@ static const struct it87_devices it87_devices[] = { ...@@ -469,7 +469,7 @@ static const struct it87_devices it87_devices[] = {
}, },
[it8628] = { [it8628] = {
.name = "it8628", .name = "it8628",
.suffix = "E", .model = "IT8628E",
.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_SIX_FANS | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI | FEAT_SIX_FANS
| FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2 | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2
...@@ -2516,8 +2516,8 @@ static int __init it87_find(int sioaddr, unsigned short *address, ...@@ -2516,8 +2516,8 @@ static int __init it87_find(int sioaddr, unsigned short *address,
err = 0; err = 0;
sio_data->sioaddr = sioaddr; sio_data->sioaddr = sioaddr;
sio_data->revision = superio_inb(sioaddr, DEVREV) & 0x0f; sio_data->revision = superio_inb(sioaddr, DEVREV) & 0x0f;
pr_info("Found IT%04x%s chip at 0x%x, revision %d\n", chip_type, pr_info("Found %s chip at 0x%x, revision %d\n",
it87_devices[sio_data->type].suffix, it87_devices[sio_data->type].model,
*address, sio_data->revision); *address, sio_data->revision);
/* in7 (VSB or VCCH5V) is always internal on some chips */ /* in7 (VSB or VCCH5V) is always internal on some chips */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7