From nobody Tue Sep 13 16:16:50 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 4MRpWR19XCz4bm9L; Tue, 13 Sep 2022 16:16:51 +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 4MRpWR0fhSz3Cbl; Tue, 13 Sep 2022 16:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663085811; 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=24aqQV9QbApuP4mGf5LacLKWV3epkE8PeQucMluW+ss=; b=qHyFWk5TulO1Py9dCx4ju+1/gORWpByzLm4R6KaoWVpqBRhhT3BWvbO4pXf95DpfANrbfY D1IjLDGML89YwdD0m2XRin5STuLsvb24tm6vtNtEDk1STNn0IbPyRuydIc84pdBPteIEcZ TRObOxQPJV4L+Tqqm/0HE+6Wh4lZEVRu/ssaxPPjS5exwYcBjyWaijubCxrtBHROEEmYY5 j6YTORIIgFSrmDO/4Im2/PzYgRT7xbn0SIqat65dQ7XZYTJBqrZLk+lRM83/mw1C8v1kqo OPtrIz0NvbsxwwwmvQmzAKjjpzg6H6dpaDh9XVUwwhgH8HPQDbX1U4X0gSHKxA== 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 4MRpWQ6rc7zNmT; Tue, 13 Sep 2022 16:16:50 +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 28DGGoeA047559; Tue, 13 Sep 2022 16:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DGGoqA047558; Tue, 13 Sep 2022 16:16:50 GMT (envelope-from git) Date: Tue, 13 Sep 2022 16:16:50 GMT Message-Id: <202209131616.28DGGoqA047558@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: d88dc1b0b9af - main - hda: add patch for Framework laptop v2 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: d88dc1b0b9af4de5ecbe0cdae1cea6055c8c9ec8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663085811; 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=24aqQV9QbApuP4mGf5LacLKWV3epkE8PeQucMluW+ss=; b=Cl7jPogAcXaMZwEzrstTkkpj7cKu2TQpzr2v7XJr1bqPUXHtpFp01w3Fv7xj+q7L1J7Yz5 P+PlO7/1cijSPVFo/LFMmcGkFxaOf0TkA8m5NsXvGWvgARdDhQ4O2J7fa5wOAmEekEBTCT cJUpByc0lz7quS1criaY0jPFvvaAPcZ0hD1839yYPbfrJYQdnDpqZHPblbKZa6qAgJ50N0 G8XdV8XEFDTqGFLvz6Aq+nsjtKX9kKk+WEhxx4xR2Bi5VC8LeUyOMIYLzNOvsbh15R4hZd WZLbPzO/VX0zCOintjzY7ZcJJUDpsSjaEylyLLibh7QHpkeHmGM4p3PqhtILjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663085811; a=rsa-sha256; cv=none; b=LH2sZRjwVn1ldgHT414oT2Vw2gmF6i/f7SKchP2qCIoXtzT7jDgyDa+HuL34mlCOFeTGHn lXybuuaPc37rD13ijMsm1AMvymGuHntVY9JxllN8Ya4PX91PY4O4JGxqyHvmAp1u0JW/z8 HSofQwQ8pOhaKfQMGVYmz8as4UwaTLeiykEiz1ZZoUHnGP7hc9FOZDJU5NR+w26NT/3GEX bvfO4p/8UsCD5rUkswNJEKJmp+IzLOlM8euFUVJ2g+3LaTgOzUryZyB5V11JVvdPZtybDT imzHF8hsfYs+P9aQrNu8DawbTsddwyyDqMMbcKYfw2t3r0joLhBjsRYtSmXCUA== 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=d88dc1b0b9af4de5ecbe0cdae1cea6055c8c9ec8 commit d88dc1b0b9af4de5ecbe0cdae1cea6055c8c9ec8 Author: Pavel Timofeev AuthorDate: 2022-08-28 23:31:40 +0000 Commit: Ed Maste CommitDate: 2022-09-13 16:16:26 +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 --- 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 dc677bc36143..632f74a0a0cc 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -329,11 +329,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 886669898005..a4928dd0b4c5 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -513,7 +513,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) \