Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea8dc1ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.2-rc6' of... 

Merge tag 'hwmon-for-linus-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

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
parents d5a8ab40 de66b380

drivers/hwmon/dell-smm-hwmon.c

+17 −1
Original line number Diff line number Diff line
@@ -929,6 +929,21 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { 


MODULE_DEVICE_TABLE(dmi, i8k_dmi_table);



static struct dmi_system_id i8k_blacklist_dmi_table[] __initdata = {

	{

		/*

		 * CPU fan speed going up and down on Dell Studio XPS 8100

		 * for unknown reasons.

		 */

		.ident = "Dell Studio XPS 8100",

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Studio XPS 8100"),

		},

	},

	{ }

};



/*

 * Probe for the presence of a supported laptop.

 */
@@ -940,7 +955,8 @@ static int __init i8k_probe(void) 
	/*

	 * Get DMI information

	 */

	if (!dmi_check_system(i8k_dmi_table)) {

	if (!dmi_check_system(i8k_dmi_table) ||

	    dmi_check_system(i8k_blacklist_dmi_table)) {

		if (!ignore_dmi && !force)

			return -ENODEV;

drivers/hwmon/g762.c

+1 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ static const struct of_device_id g762_dt_match[] = { 
	{ .compatible = "gmt,g763" },

	{ },

};

MODULE_DEVICE_TABLE(of, g762_dt_match);



/*

 * Grab clock (a required property), enable it, get (fixed) clock frequency

drivers/hwmon/nct7904.c

+1 −0
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ static const struct i2c_device_id nct7904_id[] = { 
	{"nct7904", 0},

	{}

};

MODULE_DEVICE_TABLE(i2c, nct7904_id);



static struct i2c_driver nct7904_driver = {

	.class = I2C_CLASS_HWMON,