Date: Wed, 18 May 2022 21:27:24 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4bb64770b30c - stable/13 - asmc: Add support for MacBook Pro 9,1 (mid 2012) Message-ID: <202205182127.24ILROTF079428@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb64770b30c006cdf609e1a2d99699f304ff7fa commit 4bb64770b30c006cdf609e1a2d99699f304ff7fa Author: Daniel W. Delâtre <dawdler@blacklodge.dev> AuthorDate: 2022-05-04 14:51:18 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-05-18 21:15:53 +0000 asmc: Add support for MacBook Pro 9,1 (mid 2012) PR: 261981 (cherry picked from commit 79291c9baf7d5a3f97cbd87894137df4ef157cc7) --- sys/dev/asmc/asmc.c | 10 ++++++++-- sys/dev/asmc/asmcvar.h | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 7695b05a4ae1..c70479b47822 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -239,9 +239,15 @@ static const struct asmc_model asmc_models[] = { }, { - "MacBookPro9,2", "Apple SMC MacBook Pro (mid 2012)", + "MacBookPro9,1", "Apple SMC MacBook Pro (mid 2012, 15-inch)", ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, - ASMC_MBP9_TEMPS, ASMC_MBP9_TEMPNAMES, ASMC_MBP9_TEMPDESCS + ASMC_MBP91_TEMPS, ASMC_MBP91_TEMPNAMES, ASMC_MBP91_TEMPDESCS + }, + + { + "MacBookPro9,2", "Apple SMC MacBook Pro (mid 2012, 13-inch)", + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, + ASMC_MBP92_TEMPS, ASMC_MBP92_TEMPNAMES, ASMC_MBP92_TEMPDESCS }, { diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d55259122132..47550fb7691e 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -271,19 +271,49 @@ struct asmc_softc { "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \ "Th2H", "Tm0P", "Ts0P", "Ts0S" } -#define ASMC_MBP9_TEMPS { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ +#define ASMC_MBP91_TEMPS { "TA0P", "TB0T", "TB1T", "TB2T", "TC0E", \ + "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \ + "TC4C", "TCGC", "TCSA", "TCXC", "TG0D", \ + "TG0P", "TG1D", "TG1F", "TG1d", "TGTC", \ + "TGTD", "TM0P", "TM0S", "TP0P", "TPCD", \ + "Th1H", "Th2H", "Ts0P", "Ts0S", "Tsqf", NULL } + +#define ASMC_MBP91_TEMPNAMES { "ambient", "enclosure_bottom_1", "enclosure_bottom_2", \ + "enclosure_bottom_3", "cpu_die_peci_0", "cpu_die_peci_1", \ + "cpu_proximity", "cpu_core_1", "cpu_core_2", "cpu_core_3", \ + "cpu_core_4", "intel_gpu", "cpu_sys_agent", \ + "cpu_core_peci", "gpu_analog", \ + "gpu_proximity", "geforce_gpu_digital", "tg1f", \ + "gpu_2_die", "tgtc", "tgtd", "memory_proximity", \ + "mem_bank_a1", "platform_ctrl_hub", "pch_digital", \ + "main_heatsink_r", "main_heatsink_l", "palm_rest", \ + "bottom_skin", "tsqf" } + +#define ASMC_MBP91_TEMPDESCS { "Ambient", "Enclosure Bottom 1", "Enclosure Bottom 2", \ + "Enclosure Bottom 3", "CPU Die PECI 0", "CPU Die PECI 1", \ + "CPU Proximity", "CPU Core 1", "CPU Core 2", \ + "CPU Core 3", "CPU Core 4", "Intel GPU", \ + "CPU System Agent Core", "CPU Core - PECI", \ + "GPU Die - Analog", "GPU Proximity", \ + "GeForce GPU Die - Digital", "TG1F", "GPU 2 Die" \ + "TGTC", "TGTD", "Memory Proximity", \ + "Memory Bank A1", "Platform Controller Hub", "PCH Die - Digital", \ + "Main Heatsink Right", "Main Heatsink Left", "Palm Rest", \ + "Bottom Skin", "Tsqf" } + +#define ASMC_MBP92_TEMPS { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ "TB0T", "TC1C", "TC2C", "TC0E", "TC0F", \ "TC0J", "TC0P", "TCFC", "TCGC", "TCSA", \ "TCTD", "TCXC", "TG1D", "TM0P", "TM0S", \ "TPCD", NULL } -#define ASMC_MBP9_TEMPNAMES { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ +#define ASMC_MBP92_TEMPNAMES { "Ts0P", "Ts0S", "TA0P", "TB1T", "TB2T", \ "TB0T", "TC1C", "TC2C", "TC0E", "TC0F", \ "TC0J", "TC0P", "TCFC", "TCGC", "TCSA", \ "TCTD", "TCXC", "TG1D", "TM0P", "TM0S", \ "TPCD" } -#define ASMC_MBP9_TEMPDESCS { "Palm Rest", "Memory Proximity", "Airflow 1", \ +#define ASMC_MBP92_TEMPDESCS { "Palm Rest", "Memory Proximity", "Airflow 1", \ "Battery 1", "Battery 2", "Battery TS_MAX", \ "CPU Core 1", "CPU Core 2", "CPU1", "CPU1", \ "TC0J", "CPU 1 Proximity", "TCFC", \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205182127.24ILROTF079428>