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

Commit e1741712 authored by Justin P. Mattock's avatar Justin P. Mattock Committed by Jean Delvare
Browse files

hwmon: (applesmc) Add iMac9,1 and MacBookPro2,2 support 

Add the iMac9,1 and the MacBookPro2,2 temperature sensors to hwmon
driver applesmc to fix kernel bug #14429:
https://bugzilla.kernel.org/show_bug.cgi?id=14429



Signed-off-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Acked-by: default avatarNicolas Boichat <nicolas@boichat.ch>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 2b3d1d87

drivers/hwmon/applesmc.c

+18 −0
Original line number Diff line number Diff line
@@ -142,6 +142,12 @@ static const char *temperature_sensors_sets[][41] = { 
	  "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P", "TM9S",

	  "TN0C", "TN0D", "TN0H", "TS0C", "Tp0C", "Tp1C", "Tv0S", "Tv1S",

	  NULL },

/* Set 17: iMac 9,1 */

	{ "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TH0P", "TL0P",

	  "TN0D", "TN0H", "TN0P", "TO0P", "Tm0P", "Tp0P", NULL },

/* Set 18: MacBook Pro 2,2 */

	{ "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "TM0P", "TTF0",

	  "Th0H", "Th1H", "Tm0P", "Ts0P", NULL },

};



/* List of keys used to read/write fan speeds */
@@ -1350,6 +1356,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { 
	{ .accelerometer = 1, .light = 1, .temperature_set = 15 },

/* MacPro3,1: temperature set 16 */

	{ .accelerometer = 0, .light = 0, .temperature_set = 16 },

/* iMac 9,1: light sensor only, temperature set 17 */

	{ .accelerometer = 0, .light = 0, .temperature_set = 17 },

/* MacBook Pro 2,2: accelerometer, backlight and temperature set 18 */

	{ .accelerometer = 1, .light = 1, .temperature_set = 18 },

};



/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1375,6 +1385,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { 
	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") },

		&applesmc_dmi_data[9]},

	{ applesmc_dmi_match, "Apple MacBook Pro 2,2", {

	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple Computer, Inc."),

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,2") },

		&applesmc_dmi_data[18]},

	{ applesmc_dmi_match, "Apple MacBook Pro", {

	  DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
@@ -1415,6 +1429,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { 
	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },

		&applesmc_dmi_data[4]},

	{ applesmc_dmi_match, "Apple iMac 9,1", {

	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple Inc."),

	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1") },

		&applesmc_dmi_data[17]},

	{ applesmc_dmi_match, "Apple iMac 8", {

	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") },