From nobody Thu Mar 24 13:55:10 2022 X-Original-To: dev-commits-src-all@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 1C3AF1A2408F; Thu, 24 Mar 2022 13:55:12 +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 4KPRYq2SrZz3mdg; Thu, 24 Mar 2022 13:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648130112; 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=XLg7sRg4e4qZp+8ktKKnMiyp+sJisLCyg2vOVCiDJGQ=; b=C7WJbYTroP0mWSqkhPnYEXwcY9l5l5uscZ1/HIneIrfbOOPo8Z1ALJbGIDd4wNxUj2QdtW X2aMQmiqvxvDKEXihjjQhai8CdCovBNajq0syppaMgR/ONDI653Y05bENsFJH2yHyTk62p D9NKKVnBxVbv4h5ua+ue3gCnShppoPEbf+6opoU2DYXE2Mg/7PSLTTgssWqjBvnl8/gIgT oxSgzQv2cnWzG1eN5GUnavWn/OmwnzRP5unXscp9NrVrVBlo6zFwsr6oJWk0IwPLU8Lta6 onsmFTQaD4hhz4MQS23Oq7z59os6OcH/ddh9n9jTn2qU5Ln/vAQddN22J7e+Dg== 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 C398318FB7; Thu, 24 Mar 2022 13:55:10 +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 22ODtAsk086493; Thu, 24 Mar 2022 13:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ODtA85086492; Thu, 24 Mar 2022 13:55:10 GMT (envelope-from git) Date: Thu, 24 Mar 2022 13:55:10 GMT Message-Id: <202203241355.22ODtA85086492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ff73087a897c - stable/13 - hda: add patch for Framework laptop headphone jack List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ff73087a897c1e23d0498e68f023e49e5ba7571f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648130112; 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=XLg7sRg4e4qZp+8ktKKnMiyp+sJisLCyg2vOVCiDJGQ=; b=nJknr33MwYKRRp/J1/Z4eGN3Aj3S31sVCKUodfciyWtdm9Gqb5u2P0a0vvJ1kA2O2Tfxdr 0kS59C6veOy9rmDtYu8xw+ISnMYkuaNuQTcIZu3fETt+voTgywnRBEWzbC3gZvnXVrJNDC C7uCm6A896w7t34R05w1iSOIJDQCcASN+yGYmKdYkjQo5WhdRj4fZ6aE3LwwkZwNcCITkK nr1mzTk5eN7SjkgbyPo3W9gkwEAC54XJ7rAcNRM9BDrddVeCFJ8Y/U0q9sUfKvBTEVa/pU R/W7pAkSHTkncq+epAYIEqU+Li2ouIe30fVfYWX8kUuT9G3rBIjyy7pRi64zJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648130112; a=rsa-sha256; cv=none; b=KMEKCsSkhkdeIKS7WD80vrDTL/Ssv/QUXEaVXQ6uoW9vHeXrcdPbIqVWwJTYSoV2DYLWW3 rBPWo0jpnk4VG5OKdgYpkHGppx6FesBotDKLjRudYZSzdvj3YKkoR3KLCnLokKBuRVkoJU exZl+IB9owbuptEsmVrLT1CChchEYYlmHM8I2WMEewELcKDOFvT+8KZ4Si9Ii+SIPSvXyX eCuPsV1hNqHSCBXSUztG1HPE8Fawl64KWiDZ19zlVIbxIqKBZfFi7Ye1OlXLrzHV9Bxh0n a2lNNYDvaa+a9NqMnuK5hutYcX6CQi3s57O2m4MCZFB0U0OYDjQVSQR8GdSTIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ff73087a897c1e23d0498e68f023e49e5ba7571f commit ff73087a897c1e23d0498e68f023e49e5ba7571f Author: Ed Maste AuthorDate: 2022-03-17 19:47:55 +0000 Commit: Ed Maste CommitDate: 2022-03-24 13:52:38 +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 (cherry picked from commit 06731139ca5222a6790163ed427758769696e5ab) --- 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))