Re: git: ffc58e2ca365 - main - asmc: Add MacbookAir6,2
Date: Sat, 21 Jan 2023 05:55:45 UTC
On 21 Jan 2023, at 04:43, Adrian Chadd <adrian@FreeBSD.org> wrote: > > The branch main has been updated by adrian: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ffc58e2ca36546d866bb6bd36a3aa8f762a01663 > > commit ffc58e2ca36546d866bb6bd36a3aa8f762a01663 > Author: Adrian Chadd <adrian@FreeBSD.org> > AuthorDate: 2023-01-21 04:34:31 +0000 > Commit: Adrian Chadd <adrian@FreeBSD.org> > CommitDate: 2023-01-21 04:34:31 +0000 > > asmc: Add MacbookAir6,2 > > Add in the zones for my MacbookAir6,2, a 2013 Macbook Air. > > Tested - said Macbook Air 2013. Thermal Zones and keyboard backlight > control works fine. > > Differential Revision: https://reviews.freebsd.org/D38073 > Approved by: jrtc27 Uh this is the first I’m hearing of this patch? Jess > --- > sys/dev/asmc/asmc.c | 9 +++++++-- > sys/dev/asmc/asmcvar.h | 25 +++++++++++++++++++++++++ > 2 files changed, 32 insertions(+), 2 deletions(-) > > diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c > index bec0054e2dd7..337f641e4513 100644 > --- a/sys/dev/asmc/asmc.c > +++ b/sys/dev/asmc/asmc.c > @@ -427,7 +427,13 @@ static const struct asmc_model asmc_models[] = { > ASMC_LIGHT_FUNCS, > ASMC_MBA5_TEMPS, ASMC_MBA5_TEMPNAMES, ASMC_MBA5_TEMPDESCS > }, > - > + { > + "MacBookAir6,2", "Apple SMC MacBook Air 13-inch (Early 2013)", > + ASMC_SMS_FUNCS_DISABLED, > + ASMC_FAN_FUNCS2, > + ASMC_LIGHT_FUNCS, > + ASMC_MBA6_TEMPS, ASMC_MBA6_TEMPNAMES, ASMC_MBA6_TEMPDESCS > + }, > { > "MacBookAir7,1", "Apple SMC MacBook Air 11-inch (Early 2015)", > ASMC_SMS_FUNCS_DISABLED, > @@ -435,7 +441,6 @@ static const struct asmc_model asmc_models[] = { > 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, > diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h > index a594710f1cbe..9db544a1450d 100644 > --- a/sys/dev/asmc/asmcvar.h > +++ b/sys/dev/asmc/asmcvar.h > @@ -773,6 +773,31 @@ struct asmc_softc { > "Ta0P", "Heatpipe", "Mainboard Proximity 1", "Mainboard Proximity 2", \ > "Palm Rest", "Memory Proximity" } > > +/* > + * TODO: validate the temp zones for MBA 6.x ! > + */ > +#define ASMC_MBA6_TEMPS { "TB0T", "TB1T", "TB2T", \ > + "TC0E", "TC0F", "TC0P", \ > + "TC1C", "TC2C", "TCGC", "TCSA", \ > + "TCXC", "THSP", "TM0P", "TPCD", \ > + "Ta0P", "Th1H", "Tm0P", \ > + "Ts0P", "Ts0S", NULL } > + > +#define ASMC_MBA6_TEMPNAMES { "enclosure1", "enclosure2", "enclosure3", \ > + "cputemp1", "cputemp2", "cpuproximity", \ > + "cpucore1", "cpucore2", "cpupeci", "pecisa", \ > + "TCXC", "THSP", "memorybank", "pchdie", \ > + "Ta0P", "heatpipe", "mainboardproximity1", \ > + "palmrest", "memoryproximity" } > + > +#define ASMC_MBA6_TEMPDESCS { "Enclosure Bottom 1", "Enclosure Bottom 2", "Enclosure Bottom 3", \ > + "CPU Temp 1", "CPU Temp 2", "CPU Proximity", \ > + "CPU Core 1", "CPU Core 2", "CPU Peci Core", "PECI SA", \ > + "TCXC", "THSP", "Memory Bank A", "PCH Die", \ > + "Ta0P", "Heatpipe", "Mainboard Proximity 1", \ > + "Palm Rest", "Memory Proximity" } > + > + > #define ASMC_MBA7_TEMPS { "TB0T", "TB1T", "TB2T", \ > "TC0E", "TC0F", "TC0P", \ > "TC1C", "TC2C", \