The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=dbeb51347afaf910d1962d263da7a0e54d6343f3
commit dbeb51347afaf910d1962d263da7a0e54d6343f3 Author: Hrant Dadivanyan <[email protected]> AuthorDate: 2025-04-20 15:07:34 +0000 Commit: Enji Cooper <[email protected]> CommitDate: 2026-02-22 04:31:33 +0000 asmc: Add support for macmini 6,1 and 6,2 (late 2012) models This adds the ASMC support for the macmini 6,1 and 6,2. PR: kern/268141 Differential Revision: https://reviews.freebsd.org/D49929 (cherry picked from commit 93ca9e44b752e6a9aeb0f761a022d14281d1a4e3) --- sys/dev/asmc/asmc.c | 18 +++++++++++++++ sys/dev/asmc/asmcvar.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 2a973be2e95c..d845ea7d669c 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -359,6 +359,24 @@ static const struct asmc_model asmc_models[] = { ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS }, + /* The Mac Mini 6,1 has no SMS */ + { + "Macmini6,1", "Apple SMC Mac Mini 6,1", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM61_TEMPS, ASMC_MM61_TEMPNAMES, ASMC_MM61_TEMPDESCS + }, + + /* The Mac Mini 6,2 has no SMS */ + { + "Macmini6,2", "Apple SMC Mac Mini 6,2", + NULL, NULL, NULL, + ASMC_FAN_FUNCS2, + NULL, NULL, NULL, + ASMC_MM62_TEMPS, ASMC_MM62_TEMPNAMES, ASMC_MM62_TEMPDESCS + }, + /* The Mac Mini 7,1 has no SMS */ { "Macmini7,1", "Apple SMC Mac Mini 7,1", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index c5ef84519742..102bee8a15b7 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -600,6 +600,68 @@ struct asmc_softc { "Power Supply Temperature", \ "Wireless Module Proximity Temperature", } +#define ASMC_MM61_TEMPS { "TA0P", "TA1P", \ + "TC0D", "TC0G", "TC0P", "TCPG", \ + "TI0P", \ + "TM0S", "TMBS", "TM0P", \ + "TP0P", "TPCD", \ + "Tp0C", \ + "TW0P", NULL } + +#define ASMC_MM61_TEMPNAMES { "ambient_air_proximity", "ambient_cpu_pch_wireless_dimm", \ + "cpu_die", "TC0G", "cpu_proximity", "TCPG", \ + "thunderbolt_proximity", \ + "memory_slot1", "memory_slot2", "memory_proximity", \ + "pch_controller_proximity", "pch_controller_die", \ + "pwr_supply", \ + "wireless_proximity", NULL } + +#define ASMC_MM61_TEMPDESCS { "Ambient Air Proximity Temperature", \ + "Combo Ambient CPU PCH Wireless DIMM Temperature", \ + "CPU Die Temperature", \ + NULL, \ + "CPU Proximity Temperature", \ + NULL, \ + "Thunderbolt Proximity Temperature", \ + "Memory Slot 1 Temperature", \ + "Memory Slot 2 Temperature", \ + "Memory Slots Proximity Temperature", \ + "Platform Controller Hub Proximity Temperature", \ + "Platform Controller Hub Die Temperature", \ + "Power Supply Temperature", \ + "Wireless Module Proximity Temperature", NULL } + +#define ASMC_MM62_TEMPS { "TA0P", "TA1P", \ + "TC0D", "TC0G", "TC0P", "TCPG", \ + "TI0P", \ + "TM0S", "TMBS", "TM0P", \ + "TP0P", "TPCD", \ + "Tp0C", \ + "TW0P", NULL } + +#define ASMC_MM62_TEMPNAMES { "ambient_air_proximity", "ambient_cpu_pch_wireless_dimm", \ + "cpu_die", "TC0G", "cpu_proximity", "TCPG", \ + "thunderbolt_proximity", \ + "memory_slot1", "memory_slot2", "memory_proximity", \ + "pch_controller_proximity", "pch_controller_die", \ + "pwr_supply", \ + "wireless_proximity", NULL } + +#define ASMC_MM62_TEMPDESCS { "Ambient Air Proximity Temperature", \ + "Combo Ambient CPU PCH Wireless DIMM Temperature", \ + "CPU Die Temperature", \ + NULL, \ + "CPU Proximity Temperature", \ + NULL, \ + "Thunderbolt Proximity Temperature", \ + "Memory Slot 1 Temperature", \ + "Memory Slot 2 Temperature", \ + "Memory Slots Proximity Temperature", \ + "Platform Controller Hub Proximity Temperature", \ + "Platform Controller Hub Die Temperature", \ + "Power Supply Temperature", \ + "Wireless Module Proximity Temperature", NULL } + #define ASMC_MM71_TEMPS { "TA0p", "TA1p", \ "TA2p", "TC0c", \ "TC0p", "TC1c", \
