From nobody Wed May 18 21:27:21 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F34601B3035C; Wed, 18 May 2022 21:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L3R09641Zz4Z8T; Wed, 18 May 2022 21:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cqnK4hQnG1/tZhCnqDjcnRKulHHN+KshNm4nUCe5ALw=; b=Mi1Q7fyxWSjDX/fVyKKTrv/CD0rT0/HqrgbcXRGSmtELHFw1IimAY6YPZV5x/vbVofUjVC GxkyZQn0EfoVyaXijhHaAlDhMNgnv14oQvu+/x11dKXjcbAlWPt+3EL2IoEbgfaX3moT9Q aSTpNA1Y5o0eS2bv0zlclamCZ0FPZmWQEXchWtW2C07VBOuqkSWq0muvisjRTyj669cbr2 62U/azMviXoGCOkdRTCn6Z3f9syrUrWrlNp6X/BYdXm0eaKEXumIsdFRTSWadD5zhlFzel 0guMH89SchOP4akh5mce6uwij8aCsdyK2eccqiLwomBOJAp0362PfaQjI1FrXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9E64610B50; Wed, 18 May 2022 21:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24ILRLjs079350; Wed, 18 May 2022 21:27:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ILRLK6079349; Wed, 18 May 2022 21:27:21 GMT (envelope-from git) Date: Wed, 18 May 2022 21:27:21 GMT Message-Id: <202205182127.24ILRLK6079349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 85f0cdff6ff1 - stable/13 - asmc: Add support for MacBook Air 4,1 and 4,2 (2011) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 85f0cdff6ff18d44fb17cafb705ce692c9598dd9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652909241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cqnK4hQnG1/tZhCnqDjcnRKulHHN+KshNm4nUCe5ALw=; b=Cekw6PTukEM9J52RSdyqaVqraDeAOGytx8AcWI9hSZN1bFUcQNQ5z+HuXYHeVpL0w4nnxL 8Pe/JpLARo7PF/LkfAfaRGfvJt8I72pWyhcNc3rIr0Dc5kxnurjoRuJ50TprfEX4wudRem rz5dtqCSxGuYCsVxHj8jmo0V6Bx9frjGwlfLO11rG4HCkRE1pxMof1LQojcsZbNVnd6PbP EjDuGY83Dtth+T4TTr4KBa/2KvaxBNMdk9gNEncwAb1vLcYT0/bAUafu8tfGlSzSyHKdJo FAEKXCx9wF/mmOEbmyMyBDtkXgoXxHbeM0jAL7AtgmijaRqeJq+WASbIRoFdAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652909241; a=rsa-sha256; cv=none; b=bL0zSmoG6+jnqcjyDT1Nwk+LspDLpFG+irVPkviVXCPIvFP/qYM7oekmbwTCdj5NLeoJYK ESERcHcA15FK+yhHavV+23Zv4jpuhQUAtLpUrqbStfIOkRGCknyEv5wzyIKMpw2UeLW/Il pOVn3sk3G8KSwtL15axrBtIlstmXWO5WVYNj2a4/NDvHY3SQKwDnpBO2yZBux8O9n2a06u RoekpGLXlqFhO3NDiEjor+m1oW4Luaq5ixRziVq89izdCsixPYUrwiz24HKJUIfevjIDBG c7UxViCJaMmfL3GzY0ioePASZUzf9fzSLndyHvZ2D+OZ8DtYh+hLUPmxnjWLSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=85f0cdff6ff18d44fb17cafb705ce692c9598dd9 commit 85f0cdff6ff18d44fb17cafb705ce692c9598dd9 Author: Mark Johnston AuthorDate: 2022-05-04 14:33:40 +0000 Commit: Mark Johnston CommitDate: 2022-05-18 21:15:43 +0000 asmc: Add support for MacBook Air 4,1 and 4,2 (2011) PR: 218574 Submitted by: NapoleonWils0n Submitted by: John Hay (cherry picked from commit 308340cce2f02f06855f3ed355a2936fbc5c16bf) --- sys/dev/asmc/asmc.c | 16 ++++++++++++++++ sys/dev/asmc/asmcvar.h | 24 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 5c10d512361d..732bea5384c6 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -340,6 +340,22 @@ struct asmc_model asmc_models[] = { ASMC_MBA3_TEMPS, ASMC_MBA3_TEMPNAMES, ASMC_MBA3_TEMPDESCS }, + { + "MacBookAir4,1", "Apple SMC Macbook Air 11-inch (Mid 2011)", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS, + ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS + }, + + { + "MacBookAir4,2", "Apple SMC Macbook Air 13-inch (Mid 2011)", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS, + ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS + }, + { "MacBookAir5,1", "Apple SMC MacBook Air 11-inch (Mid 2012)", ASMC_SMS_FUNCS_DISABLED, diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d30961c84472..0c5714f97806 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -594,6 +594,30 @@ struct asmc_softc { #define ASMC_MBA3_TEMPDESCS { "Enclosure Bottom", "TB1T", "TB2T", \ "TC0D", "TC0E", "TC0P" } +#define ASMC_MBA4_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", \ + "TC0D", "TC0E", "TC0F", "TC0P", \ + "TC1C", "TC2C", "TCGC", "TCSA", \ + "TH0F", "TH0J", "TH0O", "TH0o", \ + "TM0P", "TPCD", "Ta0P", "Th1H", \ + "Tm0P", "Tm1P", "Ts0P", "Ts0S", \ + NULL } + +#define ASMC_MBA4_TEMPNAMES { "TB0T", "TB1T", "TB2T", "TC0C", \ + "TC0D", "TC0E", "TC0F", "TC0P", \ + "TC1C", "TC2C", "TCGC", "TCSA", \ + "TH0F", "TH0J", "TH0O", "TH0o", \ + "TM0P", "TPCD", "Ta0P", "Th1H", \ + "Tm0P", "Tm1P", "Ts0P", "Ts0S", \ + NULL } + +#define ASMC_MBA4_TEMPDESCS { "TB0T", "TB1T", "TB2T", "TC0C", \ + "TC0D", "TC0E", "TC0F", "TC0P", \ + "TC1C", "TC2C", "TCGC", "TCSA", \ + "TH0F", "TH0J", "TH0O", "TH0o", \ + "TM0P", "TPCD", "Ta0P", "Th1H", \ + "Tm0P", "Tm1P", "Ts0P", "Ts0S", \ + NULL } + #define ASMC_MBA5_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", \ "TC0D", "TC0E", "TC0F", "TC0P", \ "TC1C", "TC2C", "TCGC", "TCSA", \