From nobody Thu Mar 17 23:27:19 2022 X-Original-To: dev-commits-src-main@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 E60EA1A19573; Thu, 17 Mar 2022 23:27:19 +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 4KKNbC6674z4jMb; Thu, 17 Mar 2022 23:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647559639; 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=jETEaHVZERHbET9lqtrnj+vd8rBuWwBy2y1NZ2QqVeI=; b=DTIIzqoaW5m0jIBYQ4CcSyCyZkJKPLfissRj8RJ+tyhyFPRQN84Zaac6g3Psqtye8iPgDt /YeSyk4XiY9kCaSXZi/UgWEHAVcb6S1LQosRfEwPPQ8gxVbC4O8y01ICZJ9i2I67MLxQsM AVQfHrpNyDid0HMMM45JnqplAkFTgGSr6TFBHbXVctTYxXMm7YR/MYRFlKo/yqhD9P/4A8 LKPEM0tvBut7gtHCeBeAg4gij9LYg8Eo7xwciCgQGejeVxbyDmjig8l9LsFPCe0OU0uO8M qzSwN1NEK2aiDes4CzhDGzMRYWgL7Nh3tSFnXRviGigad/rhly957bBd2LTJ7Q== 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 ADB9B13DFC; Thu, 17 Mar 2022 23:27:19 +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 22HNRJ0a072621; Thu, 17 Mar 2022 23:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HNRJnq072620; Thu, 17 Mar 2022 23:27:19 GMT (envelope-from git) Date: Thu, 17 Mar 2022 23:27:19 GMT Message-Id: <202203172327.22HNRJnq072620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 06731139ca52 - main - hda: add patch for Framework laptop headphone jack List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06731139ca5222a6790163ed427758769696e5ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647559639; 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=jETEaHVZERHbET9lqtrnj+vd8rBuWwBy2y1NZ2QqVeI=; b=KUgPw0Wjgh+hTYRioMF6KiifdHkhGpmbjM10HA3vRuyRfLcaElcC7iIGP0E4TuSmyMqqtg 5hWhqykB4Yv4GgCXbOssD+W3L9zA1pjvjnNg86B7CnjRhYIQ4mMVEG8vwLoHtEBma8EX+k 9NkJld028k+vpHYAPceWNvW8lBGqeLkJg3xc+Vg9wzgDN1XjjYSa4bo95de6kypnpiySZg VgD2GyZptJdTj3RcAA+1nNrapqmiHYOEr4z+df0w3oSB2tflhRXa72Etc2w4RzyF9+J2nu iUsiuklkRcv9icieTb/WKzGb0gSxaM/T1BJStw6PxPUQiDCdHew/CUTEwyo7Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647559639; a=rsa-sha256; cv=none; b=O+m6aYCbL4T+VW7yTpu17QwN/zRit+WQ+yUWiVt59S1ei6IjpIh8n85XFIenns8eGODKUc WXCcdJRaO9RJx2biOcxt3W4Wu0sfnAM6A2mDiHyO63ahSI3qa2e7/4Yrqu3usj59+jHjU3 aALt2xlKAE0ZcSFhd9QkX0/IeWO7OVBCI6DUFrLozh4D1ONFHl3H+hWeeSdzn5WwGcg0Qw IGsNStw5nv5kPb5sFsjBHXMeKOEKXiuuv9T51Wn52rjv9dcYtYtwOMb6Jk3S7uPbYqrmgG sCCcuw3GK0dCkmvANGtPzYNIa6KjB8UdQmi7YR6K7dcWe0Mb2HuPUfQxZFgouw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=06731139ca5222a6790163ed427758769696e5ab commit 06731139ca5222a6790163ed427758769696e5ab Author: Ed Maste AuthorDate: 2022-03-17 19:47:55 +0000 Commit: Ed Maste CommitDate: 2022-03-17 23:22:02 +0000 hda: add patch for Framework laptop headphone jack For Framework laptops built after Oct 2021 (like mine) that have a Tempo Semiconductor 92HD95B codec rather than Realtek ALC295 (see https://frame.work/ca/en/blog/solving-for-silicon-shortages). As we do for many other laptops, put the headphone jack and speakers in the same association by default so that the generic sound device automatically switches between them. Also specify the jack colour and location. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34596 --- sys/dev/sound/pci/hda/hdaa_patches.c | 7 +++++++ sys/dev/sound/pci/hda/hdac.h | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index f824472fc9a2..0f5cfa87cc9d 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -322,6 +322,13 @@ hdac_pin_patch(struct hdaa_widget *w) patch_str = "as=1 seq=15"; break; } + } else if (id == HDA_CODEC_IDT92HD95B && + (subid == FRAMEWORK_LAPTOP_SUBVENDOR)) { + switch (nid) { + case 10: + patch_str = "as=1 seq=15 color=Black loc=Left"; + break; + } } else { /* * loop over hdaa_model_pin_patch diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 8fcdad7ac7a5..ee6f14877c2e 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -503,6 +503,10 @@ #define AOPEN_VENDORID 0xa0a0 #define AOPEN_I915GMMHFS_SUBVENDOR HDA_MODEL_CONSTRUCT(AOPEN, 0x8202) +/* Framework */ +#define FRAMEWORK_VENDORID 0xf111 +#define FRAMEWORK_LAPTOP_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0001) + /* All codecs you can eat... */ #define HDA_CODEC_CONSTRUCT(vendor, id) \ (((uint32_t)(vendor##_VENDORID) << 16) | ((id) & 0xffff))