From nobody Tue Sep 20 00:46:06 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 4MWjXG6hWDz4cRp5; Tue, 20 Sep 2022 00:46:06 +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 4MWjXG691tz4Kvb; Tue, 20 Sep 2022 00:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663634766; 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=Zf0/XQvFx7M3YpaBdIcoDPwIlY1w5UMxjMLK1J3pLc8=; b=RyOxvt9Ru46+DZreFz0RMbAoMfYZaaA5hMlBu+xVjJBf2ZXtR1TAlqvkO7IlvtuRFZp0cl toVQhqqkHgtHdAq+VYeUXFtq/lJ2RkhnQTjpcBaXAMICCtFtDXgxOl9kGePtbIwjk15kgZ lpX2s1beHIOXelgIzfGLX+kUu7R/uWSh1XtJQRwFgl3heF0E/GBUqnTIkk+geuQekRadr9 EMQk788Ti6k5hbiw78wz+a4+y+8pTiaMlLFeozlM+8TeOUMGyRbtqDKdWyFm0JebjPJ76F HfNNPl+y2l5R0iw8qnrUGlhHKpKp0B6qkgZjZOqycyieA85CfARG8wsJ1GBR3A== 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 4MWjXG50dHzYZs; Tue, 20 Sep 2022 00:46:06 +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 28K0k6Ap021461; Tue, 20 Sep 2022 00:46:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28K0k6eh021460; Tue, 20 Sep 2022 00:46:06 GMT (envelope-from git) Date: Tue, 20 Sep 2022 00:46:06 GMT Message-Id: <202209200046.28K0k6eh021460@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: 04c146afea26 - stable/13 - hda: add patch for Framework laptop v2 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: 04c146afea26ea71c6f628ed94435740f87eda7e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663634766; 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=Zf0/XQvFx7M3YpaBdIcoDPwIlY1w5UMxjMLK1J3pLc8=; b=JvlSlBeq+X37rzLxr63htwrKvzxpxvockfRuIbqgF/lLAadaEkjT7a1EpKtyiOJitAwAbb udGylYsDFVghpRbwo/DWyhZJLr1TbgOBSofcLmyuj5HvOQo9b1M2OAi9w7CgfQEQdunwFx YUlPVbDB0loc286wdthqbItgkSd7b8+3wbV/P7gQdEJ59K/986gVPDB2+tmoQtNB0DbxJL 541NmMM0Nq1381qaABcWvVwyLVMjuF2qzIpIrbX8s3syON3yM3TmHetiAxFAg2Ry0eGuEo P+dr/b8MPP0W7R2sCG1RDQVItVJCDr4LAxdyvuIKqmOmv2L2L32vyDAl+4la7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663634766; a=rsa-sha256; cv=none; b=YkQHn7B2tYMNRTUkVH0MAZW5vH6wtixdptKkprhhFSwYqLrU4VeJb977fSjlxijQ+QbU/A KKBTAA8P9McnoZxeLh5EvMtNQFK2aGd8dSFj72GN9omK03xrFxQagazdzGQJLIeXko7A/q 74r8hGXVjaSZ2mglDMzj3UxrARQFsDeJvXze9ZQlHhdkOrnQSgh/oZaK4fBCwST8ZWOlgn O34Qw/2U7IgrQMNkwJWwnbMt0PYg78Zn9Lz0uCxgmWn6/8JVeEh7gF3vkS+4Y4r0AgWrb4 VLhPNYBYKkU6WohHWOx142G2sJayDm9zIDVFzocUfw8CC3EHJpHhoTeoUdWYeA== 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=04c146afea26ea71c6f628ed94435740f87eda7e commit 04c146afea26ea71c6f628ed94435740f87eda7e Author: Pavel Timofeev AuthorDate: 2022-08-28 23:31:40 +0000 Commit: Ed Maste CommitDate: 2022-09-20 00:45:40 +0000 hda: add patch for Framework laptop v2 headphone jack Fix headphone (12th gen Intel laptops) and mic jack (both 11th and 12th gen) switching. PR: 262579 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36354 (cherry picked from commit d88dc1b0b9af4de5ecbe0cdae1cea6055c8c9ec8) --- sys/dev/sound/pci/hda/hdaa_patches.c | 6 +++++- sys/dev/sound/pci/hda/hdac.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 0f5cfa87cc9d..c64a824d7d5e 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -323,11 +323,15 @@ hdac_pin_patch(struct hdaa_widget *w) break; } } else if (id == HDA_CODEC_IDT92HD95B && - (subid == FRAMEWORK_LAPTOP_SUBVENDOR)) { + (subid == FRAMEWORK_LAPTOP_0001_SUBVENDOR || + subid == FRAMEWORK_LAPTOP_0002_SUBVENDOR)) { switch (nid) { case 10: patch_str = "as=1 seq=15 color=Black loc=Left"; break; + case 11: + patch_str = "as=3 seq=15 color=Black loc=Left"; + break; } } else { /* diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 8e7990acd73c..c4aab1fc12cc 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -512,7 +512,8 @@ /* Framework */ #define FRAMEWORK_VENDORID 0xf111 -#define FRAMEWORK_LAPTOP_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0001) +#define FRAMEWORK_LAPTOP_0001_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0001) +#define FRAMEWORK_LAPTOP_0002_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0002) /* All codecs you can eat... */ #define HDA_CODEC_CONSTRUCT(vendor, id) \