svn commit: r342753 - stable/12/sys/dev/asmc

[David Bright]

Author: dab
Date: Fri Jan  4 02:21:00 2019
New Revision: 342753
URL: https://svnweb.freebsd.org/changeset/base/342753

Log:
  MFC r342171:
  
  asmc: Add support for mid-2011 Macmini 5,2
  
  PR:		225911
  Submitted by:	trev <fbsdbugs4 at sentry.org>
  Reported by:	trev <fbsdbugs4 at sentry.org>

Modified:
  stable/12/sys/dev/asmc/asmc.c
  stable/12/sys/dev/asmc/asmcvar.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/asmc/asmc.c
==============================================================================
--- stable/12/sys/dev/asmc/asmc.c	Fri Jan  4 02:20:34 2019	(r342752)
+++ stable/12/sys/dev/asmc/asmc.c	Fri Jan  4 02:21:00 2019	(r342753)
@@ -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: stable/12/sys/dev/asmc/asmcvar.h
==============================================================================
--- stable/12/sys/dev/asmc/asmcvar.h	Fri Jan  4 02:20:34 2019	(r342752)
+++ stable/12/sys/dev/asmc/asmcvar.h	Fri Jan  4 02:21:00 2019	(r342753)
@@ -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", \