Pull hwmon fixes from Guenter Roeck: - Export module alias information in g762 and nct7904 to support auto-loading. - Blacklist Dell Studio XPS 8100 in dell-smm to fix fan control problems. * tag 'hwmon-for-linus-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (g762) Export OF module alias information hwmon: (nct7904) Export I2C module alias information hwmon: (dell-smm) Blacklist Dell Studio XPS 8100
Unified · Split
| @@ -929,6 +929,21 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { · 928 unmodified lines | |||
| 929 | 929 | ||
| 930 | MODULE_DEVICE_TABLE(dmi, i8k_dmi_table); | 930 | MODULE_DEVICE_TABLE(dmi, i8k_dmi_table); |
| 931 | 931 | ||
| 932 | static struct dmi_system_id i8k_blacklist_dmi_table[] __initdata = { | ||
| 933 | { | ||
| 934 | /* | ||
| 935 | * CPU fan speed going up and down on Dell Studio XPS 8100 | ||
| 936 | * for unknown reasons. | ||
| 937 | */ | ||
| 938 | .ident = "Dell Studio XPS 8100", | ||
| 939 | .matches = { | ||
| 940 | DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 941 | DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Studio XPS 8100"), | ||
| 942 | }, | ||
| 943 | }, | ||
| 944 | { } | ||
| 945 | }; | ||
| 946 | |||
| 932 | /* | 947 | /* |
| 933 | * Probe for the presence of a supported laptop. | 948 | * Probe for the presence of a supported laptop. |
| 934 | */ | 949 | */ |
| @@ -940,7 +955,8 @@ static int __init i8k_probe(void) · 5 unmodified lines | |||
| 940 | /* | 955 | /* |
| 941 | * Get DMI information | 956 | * Get DMI information |
| 942 | */ | 957 | */ |
| 943 | if (!dmi_check_system(i8k_dmi_table)) { | 958 | if (!dmi_check_system(i8k_dmi_table) || |
| 959 | dmi_check_system(i8k_blacklist_dmi_table)) { | ||
| 944 | if (!ignore_dmi && !force) | 960 | if (!ignore_dmi && !force) |
| 945 | return -ENODEV; | 961 | return -ENODEV; |
| 946 | 962 | ||
| @@ -582,6 +582,7 @@ static const struct of_device_id g762_dt_match[] = { · 581 unmodified lines | |||
| 582 | { .compatible = "gmt,g763" }, | 582 | { .compatible = "gmt,g763" }, |
| 583 | { }, | 583 | { }, |
| 584 | }; | 584 | }; |
| 585 | MODULE_DEVICE_TABLE(of, g762_dt_match); | ||
| 585 | 586 | ||
| 586 | /* | 587 | /* |
| 587 | * Grab clock (a required property), enable it, get (fixed) clock frequency | 588 | * Grab clock (a required property), enable it, get (fixed) clock frequency |
| @@ -575,6 +575,7 @@ static const struct i2c_device_id nct7904_id[] = { · 574 unmodified lines | |||
| 575 | {"nct7904", 0}, | 575 | {"nct7904", 0}, |
| 576 | {} | 576 | {} |
| 577 | }; | 577 | }; |
| 578 | MODULE_DEVICE_TABLE(i2c, nct7904_id); | ||
| 578 | 579 | ||
| 579 | static struct i2c_driver nct7904_driver = { | 580 | static struct i2c_driver nct7904_driver = { |
| 580 | .class = I2C_CLASS_HWMON, | 581 | .class = I2C_CLASS_HWMON, |