git: dc484aed0a01 - main - asmc: Update Mac Pro 6 sensor definitions

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=dc484aed0a014de0fdf33d972c36413da6903a2e

commit dc484aed0a014de0fdf33d972c36413da6903a2e
Author:     Adam S <adam@anschwa.com>
AuthorDate: 2022-05-09 12:44:09 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-05-09 12:56:39 +0000

    asmc: Update Mac Pro 6 sensor definitions
    
    - Make descriptions a bit more human-friendly.
    - Don't attempt to probe fan safe speeds, this model does not provide
      one.
    
    PR:             260781
    MFC after:      2 weeks
---
 sys/dev/asmc/asmc.c    |  6 +++---
 sys/dev/asmc/asmcvar.h | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
index 8ca9d1486749..371329443033 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -363,11 +363,11 @@ static const struct asmc_model asmc_models[] = {
 	  ASMC_MP5_TEMPS, ASMC_MP5_TEMPNAMES, ASMC_MP5_TEMPDESCS
 	},
 
-	/* Idem for the MacPro 2013 (cylinder) */
+	/* Idem for the Mac Pro 2013 (cylinder) */
 	{
-	  "MacPro6,1", "Apple SMC MacPro (2013)",
+	  "MacPro6,1", "Apple SMC Mac Pro (2013)",
 	  ASMC_SMS_FUNCS_DISABLED,
-	  ASMC_FAN_FUNCS,
+	  ASMC_FAN_FUNCS2,
 	  ASMC_LIGHT_FUNCS_DISABLED,
 	  ASMC_MP6_TEMPS, ASMC_MP6_TEMPNAMES, ASMC_MP6_TEMPDESCS
 	},
diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h
index 2b981f1bd6c6..533686d0c56b 100644
--- a/sys/dev/asmc/asmcvar.h
+++ b/sys/dev/asmc/asmcvar.h
@@ -646,17 +646,17 @@ struct asmc_softc {
 #define ASMC_MP6_TEMPS		{ "TA0P", "TA1P", "TC0P", "TG0D", "TG0P", \
 				  "TG1D", "TG1P", "TM0P", "TM1P", NULL }
 
-#define ASMC_MP6_TEMPNAMES	{ "AMBIENT_AIR_0", "AMBIENT_AIR_1", \
-				  "CPU_0_PROXIMITY", "GPU_0_DIODE", \
-				  "GPU_0_PROXIMITY", "GPU_1_DIODE", \
-				  "GPU_1_PROXIMITY", "MEM_SLOTS_0_PROXIMITY", \
-				  "MEM_SLOTS_1_PROXIMITY" }
-
-#define ASMC_MP6_TEMPDESCS	{ "Ambient Air 0", "Ambient Air 1", \
-				  "CPU Proximity 0", "GPU Diode 0", \
-				  "GPU Proximity 0", "GPU Diode 1", \
-				  "GPU Proximity 1", "Memory Proximity 0", \
-				  "Memory Proximity 1" }
+#define ASMC_MP6_TEMPNAMES	{ "ambient_air_1", "ambient_air_2", \
+				  "cpu_proximity", "gpu_diode_1", \
+				  "gpu_proximity_1", "gpu_diode_2", \
+				  "gpu_proximity_2", "mem_proximity_1", \
+				  "mem_proximity_2" }
+
+#define ASMC_MP6_TEMPDESCS	{ "Ambient Air 1", "Ambient Air 2", \
+				  "CPU Proximity", "GPU Diode 1", \
+				  "GPU Proximity 1", "GPU Diode 2", \
+				  "GPU Proximity 2", "Memory Bank A", \
+				  "Memory Bank B" }
 
 #define	ASMC_MBA_TEMPS		{ "TB0T", NULL }
 #define	ASMC_MBA_TEMPNAMES	{ "enclosure" }