Commit 4e4a99d3 authored by Henrik Rydberg's avatar Henrik Rydberg Committed by Jean Delvare
Browse files

hwmon: (applesmc) Add support for MacBook Pro 5,3 and 5,4 



The MacBookPro 5,3 model has two fans, whereas the 5,4 model has
only one. This patch adds explicit support for the 5,3 and 5,4 models.

Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent ea63c2b9

drivers/hwmon/applesmc.c

+19 −0
Original line number Diff line number Diff line
@@ -148,6 +148,13 @@ static const char *temperature_sensors_sets[][41] = { 
/* Set 18: MacBook Pro 2,2 */

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

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

/* Set 19: Macbook Pro 5,3 */

	{ "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",

	  "TG0F", "TG0H", "TG0P", "TG0T", "TN0D", "TN0P", "TTF0", "Th2H",

	  "Tm0P", "Ts0P", "Ts0S", NULL },

/* Set 20: MacBook Pro 5,4 */

	{ "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TN0D",

	  "TN0P", "TTF0", "Th2H", "Ts0P", "Ts0S", NULL },

};



/* List of keys used to read/write fan speeds */
@@ -1363,6 +1370,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { 
	{ .accelerometer = 0, .light = 0, .temperature_set = 17 },

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

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

/* MacBook Pro 5,3: accelerometer, backlight and temperature set 19 */

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

/* MacBook Pro 5,4: accelerometer, backlight and temperature set 20 */

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

};



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

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },

		&applesmc_dmi_data[7]},

	{ applesmc_dmi_match, "Apple MacBook Pro 5,4", {

	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4") },

		&applesmc_dmi_data[20]},

	{ applesmc_dmi_match, "Apple MacBook Pro 5,3", {

	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3") },

		&applesmc_dmi_data[19]},

	{ applesmc_dmi_match, "Apple MacBook Pro 5", {

	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },