Author: dab
Date: Mon Dec 17 17:21:45 2018
New Revision: 342171
URL: https://svnweb.freebsd.org/changeset/base/342171

Log:
  asmc: Add support for mid-2011 Macmini 5,2
  
  PR:           225911
  Submitted by: trev <fbsdbu...@sentry.org>
  Reported by:  trev <fbsdbu...@sentry.org>
  MFC after:    1 week

Modified:
  head/sys/dev/asmc/asmc.c
  head/sys/dev/asmc/asmcvar.h

Modified: head/sys/dev/asmc/asmc.c
==============================================================================
--- head/sys/dev/asmc/asmc.c    Mon Dec 17 17:11:00 2018        (r342170)
+++ head/sys/dev/asmc/asmc.c    Mon Dec 17 17:21:45 2018        (r342171)
@@ -260,6 +260,15 @@ struct asmc_model asmc_models[] = {
          ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS
        },
 
+       /* The Mac Mini 5,2 has no SMS */
+       { 
+         "Macmini5,2", "Apple SMC Mac Mini 5,2",
+         NULL, NULL, NULL,
+         ASMC_FAN_FUNCS2,
+         NULL, NULL, NULL,
+         ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS
+       },
+
        /* Idem for the MacPro */
        {
          "MacPro2", "Apple SMC Mac Pro (8-core)",

Modified: head/sys/dev/asmc/asmcvar.h
==============================================================================
--- head/sys/dev/asmc/asmcvar.h Mon Dec 17 17:11:00 2018        (r342170)
+++ head/sys/dev/asmc/asmcvar.h Mon Dec 17 17:21:45 2018        (r342171)
@@ -339,6 +339,41 @@ struct asmc_softc {
                                  "Northbridge Proximity Temperature", \
                                  "Wireless Module Proximity Temperature", }
 
+#define ASMC_MM52_TEMPS                { "TA0P", "TA1P", \
+                                 "TC0D", "TC0P", \
+                                 "TG0D", "TG1D", \
+                                 "TG0P", "TG0M", \
+                                 "TI0P", \
+                                 "TM0S", "TMBS", \
+                                 "TM0P", "TP0P", \
+                                 "TPCD", "Tp0C", \
+                                 "TW0P", NULL }
+
+#define ASMC_MM52_TEMPNAMES    { "ambient_air_proximity", 
"ambient_cpu_pch_wireless_dimm", \
+                                 "cpu_die", "cpu_proximity", \
+                                 "gpu_diode1", "gpu_diode2", \
+                                 "gpu_proximity", "gpu_integrated_switcher", \
+                                 "thunderbolt_proximity", \
+                                 "memory_slot1", "memory_slot2", \
+                                 "memory_proximity", 
"pch_controller_proximity", \
+                                 "pch_controller_die", "pwr_supply", \
+                                 "wireless_proximity", }
+ 
+#define ASMC_MM52_TEMPDESCS    { "Ambient Air Proximity Temperature", \
+                                 "Combo Ambient CPU PCH Wireless DIMM 
Temperature", \
+                                 "CPU Die Temperature", "CPU Proximity 
Temperature", \
+                                 "GPU Diode 1 Temperature" , "GPU Diode 2 
Temperature", \
+                                 "GPU Proximity Temperature", \
+                                 "Integrated Graphics/GPU Switcher 
Temperature", \
+                                 "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", }
+
 #define ASMC_MP_TEMPS          { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
                                  "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
                                  "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to