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

[David Bright]

Author: dab
Date: Wed Dec 19 21:28:11 2018
New Revision: 342241
URL: https://svnweb.freebsd.org/changeset/base/342241

Log:
  MFC r341820:
  
  asmc: Add Support for MacBookAir 7,1 and 7,2
  
  PR:		226172
  Submitted by:	James Wright <james.wright at jigsawdezign.com>
  Reported by:	James Wright <james.wright at jigsawdezign.com>

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	Wed Dec 19 21:25:43 2018	(r342240)
+++ stable/12/sys/dev/asmc/asmc.c	Wed Dec 19 21:28:11 2018	(r342241)
@@ -300,6 +300,21 @@ struct asmc_model asmc_models[] = {
 	  ASMC_MBA5_TEMPS, ASMC_MBA5_TEMPNAMES, ASMC_MBA5_TEMPDESCS
 	},
 
+	{
+	  "MacBookAir7,1", "Apple SMC MacBook Air 11-inch (Early 2015)",
+	  ASMC_SMS_FUNCS_DISABLED,
+	  ASMC_FAN_FUNCS2,
+	  ASMC_LIGHT_FUNCS,
+	  ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS
+	},
+
+	{
+	  "MacBookAir7,2", "Apple SMC MacBook Air 13-inch (Early 2015)",
+	  ASMC_SMS_FUNCS_DISABLED,
+	  ASMC_FAN_FUNCS2,
+	  ASMC_LIGHT_FUNCS,
+	  ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS
+	},
 
 	{ NULL, NULL }
 };

Modified: stable/12/sys/dev/asmc/asmcvar.h
==============================================================================
--- stable/12/sys/dev/asmc/asmcvar.h	Wed Dec 19 21:25:43 2018	(r342240)
+++ stable/12/sys/dev/asmc/asmcvar.h	Wed Dec 19 21:28:11 2018	(r342241)
@@ -428,3 +428,27 @@ struct asmc_softc {
 	                          "TCXC", "THSP", "Memory Bank A", "PCH Die", \
 	                          "Ta0P", "Heatpipe", "Mainboard Proximity 1", "Mainboard Proximity 2", \
 	                          "Palm Rest", "Memory Proximity" }
+
+#define	ASMC_MBA7_TEMPS		{ "TB0T", "TB1T", "TB2T", \
+                         	  "TC0E", "TC0F", "TC0P", \
+	                          "TC1C", "TC2C", \
+	                          "TCGC", "TCSA", "TCXC", \
+	                          "THSP", "TM0P", "TPCD", \
+	                          "TW0P" "Ta0P", "Th1H", \
+	                          "Tm0P", "Ts0P", "Ts0S", NULL }
+
+#define	ASMC_MBA7_TEMPNAMES	{ "enclosure1", "enclosure2", "enclosure3", \
+	                          "cputemp1", "cputemp2", "cpuproximity", \
+	                          "cpucore1", "cpucore2", \
+	                          "pecigpu", "pecisa", "pecicpu", \
+	                          "thunderboltproximity", "memorybank", "pchdie", \
+	                          "wirelessproximity", "airflowproximity", "heatpipe", \
+	                          "mainboardproximity", "palmrest", "memoryproximity" }
+
+#define	ASMC_MBA7_TEMPDESCS	{ "Enclosure Bottom 1", "Enclosure Bottom 2", "Enclosure Bottom 3", \
+	                          "CPU Temp 1", "CPU Temp 2", "CPU Proximity", \
+	                          "CPU Core 1", "CPU Core 2", \
+	                          "PECI GPU", "PECI SA", "PECI CPU", \
+	                          "Thunderbolt Proximity", "Memory Bank A", "PCH Die", \
+	                          "Wireless Proximity", "Airflow Proxmity", "Heatpipe", \
+	                          "Mainboard Proximity", "Palm Rest", "Memory Proximity" }