asmc: Add support for Macmini 5,1 (2011) and 5,3 and 7,1 (2014) models

PR:		262456
MFC after:	2 weeks
This commit is contained in:
Trev 2022-05-04 11:00:40 -04:00 committed by Mark Johnston
parent a31b0c0c47
commit 601abb300c
2 changed files with 61 additions and 1 deletions

View file

@ -298,8 +298,18 @@ static const struct asmc_model asmc_models[] = {
ASMC_MM41_TEMPS, ASMC_MM41_TEMPNAMES, ASMC_MM41_TEMPDESCS
},
/* The Mac Mini 5,1 has no SMS */
/* - same sensors as Mac Mini 5,2 */
{
"Macmini5,1", "Apple SMC Mac Mini 5,1",
NULL, NULL, NULL,
ASMC_FAN_FUNCS2,
NULL, NULL, NULL,
ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS
},
/* The Mac Mini 5,2 has no SMS */
{
{
"Macmini5,2", "Apple SMC Mac Mini 5,2",
NULL, NULL, NULL,
ASMC_FAN_FUNCS2,
@ -307,6 +317,25 @@ static const struct asmc_model asmc_models[] = {
ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS
},
/* The Mac Mini 5,3 has no SMS */
/* - same sensors as Mac Mini 5,2 */
{
"Macmini5,3", "Apple SMC Mac Mini 5,3",
NULL, NULL, NULL,
ASMC_FAN_FUNCS2,
NULL, NULL, NULL,
ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS
},
/* The Mac Mini 7,1 has no SMS */
{
"Macmini7,1", "Apple SMC Mac Mini 7,1",
NULL, NULL, NULL,
ASMC_FAN_FUNCS2,
NULL, NULL, NULL,
ASMC_MM71_TEMPS, ASMC_MM71_TEMPNAMES, ASMC_MM71_TEMPDESCS
},
/* Idem for the Mac Pro "Quad Core" (original) */
{
"MacPro1,1", "Apple SMC Mac Pro (Quad Core)",

View file

@ -475,6 +475,37 @@ struct asmc_softc {
"Power Supply Temperature", \
"Wireless Module Proximity Temperature", }
#define ASMC_MM71_TEMPS { "TA0p", "TA1p", \
"TA2p", "TC0c", \
"TC0p", "TC1c", \
"TCGc", "TCSc", \
"TCXC", "TCXR", \
"TM0p", "TPCd", \
"TW0p", "Te0T", \
"Tm0P", NULL }
#define ASMC_MM71_TEMPNAMES { "ambient_air1", "ambient_air2", \
"ambient_air3", "cpu_core1_peci", \
"cpu_proximity", "cpu_core2_peci", \
"intel_gpu", "cpu_sa_core_peci", \
"cpu_core", "cpu_peci_dts", \
"memory_proximity", "pch_controller_die", \
"wireless_proximity", "thunderbolt_diode", \
"logic_board", }
#define ASMC_MM71_TEMPDESCS { "Ambient Air Temperature 1", \
"Ambient Air Temperature 2", \
"Ambient Air Temperature 3", \
"CPU Core 1 PECI Temperature", "CPU Proximity Temperature", \
"CPU Core 2 PECI Temperature", "Intel GPU Temperature", \
"CPU System Agent Core PECI Temperature", \
"CPU Core Temperature", "CPU PECI DTS Temperature", \
"Memory Proximity Temperature", \
"Platform Controller Hub Die Temperature", \
"Wireless Module Proximity Temperature", \
"Thunderbolt Diode Temperature", \
"Logic Board temperature", }
#define ASMC_MP1_TEMPS { "TA0P", \
"TCAH", "TCBH", \
"TC0P", "TC0C", "TC1C", \