From nobody Sun Mar 03 13:18:25 2024 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 4Tnj7j56Zfz5CmbV; Sun, 3 Mar 2024 13:18:25 +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 4Tnj7j4Hn6z41L9; Sun, 3 Mar 2024 13:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709471905; 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=bR9o+XLfB+oH1LMtMQSSrxnmm3csvO0suk+E2tZsyHg=; b=vi0LpPZxgbdYTL9tn0XajQWaWhUHpExjq9XmVq5O5orGPCmNEsdMjCfzymUW5w7dUnTCSY hofLmFtIxJ93QDG0qIF9SaNNpboPClmXVLLipzKAO5tF3ElwayGNuroxW8hbOahydeEoba ngjwO/PMyqDxSomV3UJg81jZuGTNATM17tytfSyxVipzGLS91IfrQg7AOk7V+rND57xnC1 PEHLyFGxyK4JlS4/2gxNTxn1Cg5nJhZWlU3vGXjtMj3bp4FXnAahgLBHfSQZBdESg9FPTG +FSrGcsrR+PNfh179Yo8U6824tIyj6OMAWCdlmrECh+tEGiy19BXex0tBT7ZQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709471905; a=rsa-sha256; cv=none; b=F68W5SQ8m9pURlH0znw9LSdpLYn3wEVYPH8Q3bGvE3TEiijgte7g91j3I06kcAawcr5VP6 ffTMQCEc7+5RpfjzJAntawxsOKedTrWaaXjxswG9noHZjQmQAgll1y/SDtniBqT5AorgnN vIglVyhn0BXQvGcmgmggzDipwlpKXa1SwUcntusGJz+xHbU9MuepejRg9/JgGptnzUYEr+ 9uK5EcI7+JGTTcjosdOX2ydt/JYoYlx7CrgYhwDEsvsjEAhtlIG4oxYQKKKE9pmHv4Rtzr lFFn0ln5FCtb+/7uKfcJMfCJkymQdWV5aKEAloIVwRjgm+iZpHgwJ7Q4I8gGyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709471905; 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=bR9o+XLfB+oH1LMtMQSSrxnmm3csvO0suk+E2tZsyHg=; b=s/ewhA9ESfbC8NTtQ2/yyXA4eb7yMogt5H92ju7QhAaALrRD9sbGh3HnOA1XvSJp18hpSe z6IXENa8w+FDFNvalPpuf/Xa6F2igo5YsObvVUNVlTwkTNNCDpiCLBvGgV13RHwFxkNBza YjeP11Nrr+BIASD3Jc259OxcO7WATbGv7Zs0PKj021wawVP2o2wkPcGn6VdZLpzrDBIJSf gYYpuld7zQT6DKfp12vn6alWfRVFZww7zpUnrFiaYhisFSkpw7AtosUR6OpWT7Hig+/LVr +ipo0mlnDWYvm2FCKRGCStGqpMZRqmuiYhdHHtK87iNHVg2eXmMI13oH/IJQwQ== 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 4Tnj7j3lFVzftW; Sun, 3 Mar 2024 13:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423DIPts013174; Sun, 3 Mar 2024 13:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423DIPTw013171; Sun, 3 Mar 2024 13:18:25 GMT (envelope-from git) Date: Sun, 3 Mar 2024 13:18:25 GMT Message-Id: <202403031318.423DIPTw013171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2d694deca985 - stable/14 - snd_hda: Add patches for the Lenovo Ideapad 330-15 and ThinkPad X230 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d694deca985517c3eab9d51bf4c7cf20dd6bc03 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2d694deca985517c3eab9d51bf4c7cf20dd6bc03 commit 2d694deca985517c3eab9d51bf4c7cf20dd6bc03 Author: Dmitry Lukhtionov AuthorDate: 2024-02-18 17:07:39 +0000 Commit: Christos Margiolis CommitDate: 2024-03-03 13:18:02 +0000 snd_hda: Add patches for the Lenovo Ideapad 330-15 and ThinkPad X230 PR: 259640 MFC after: 2 weeks Reviewed by: delphij, markj Differential Revision: https://reviews.freebsd.org/D43804 (cherry picked from commit 5968e477a560406c480d78ebe438a04f57121119) --- sys/dev/sound/pci/hda/hdaa_patches.c | 20 ++++++++++++++++++++ sys/dev/sound/pci/hda/hdac.h | 2 ++ sys/dev/sound/pci/hda/hdacc.c | 1 + 3 files changed, 23 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 5bb4dcd79af7..3a7dfc63637a 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -338,6 +338,26 @@ hdac_pin_patch(struct hdaa_widget *w) patch_str = "as=3 seq=15 color=Black loc=Left"; break; } + } else if (id == HDA_CODEC_ALC230 && + subid == LENOVO_I330_SUBVENDOR) { + switch (nid) { + case 20: + patch_str = "as=1 seq=0 device=Speaker"; + break; + case 33: + patch_str = "as=1 seq=15 device=Headphones"; + break; + } + } else if (id == HDA_CODEC_ALC269 && + subid == LENOVO_X230_SUBVENDOR) { + switch (nid) { + case 21: + patch_str = "as=1 seq=15"; + break; + case 24: + patch_str = "as=4 seq=15"; + 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 c3951edd362c..31bdc9130d9b 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -377,6 +377,7 @@ #define LENOVO_L5AMD_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x381b) #define LENOVO_L5INTEL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x380f) #define LENOVO_3000_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x384e) +#define LENOVO_I330_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3808) #define LENOVO_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0xffff) /* Samsung */ @@ -537,6 +538,7 @@ #define HDA_CODEC_ALC221 HDA_CODEC_CONSTRUCT(REALTEK, 0x0221) #define HDA_CODEC_ALC222 HDA_CODEC_CONSTRUCT(REALTEK, 0x0222) #define HDA_CODEC_ALC225 HDA_CODEC_CONSTRUCT(REALTEK, 0x0225) +#define HDA_CODEC_ALC230 HDA_CODEC_CONSTRUCT(REALTEK, 0x0230) #define HDA_CODEC_ALC231 HDA_CODEC_CONSTRUCT(REALTEK, 0x0231) #define HDA_CODEC_ALC233 HDA_CODEC_CONSTRUCT(REALTEK, 0x0233) #define HDA_CODEC_ALC234 HDA_CODEC_CONSTRUCT(REALTEK, 0x0234) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index f815e39392d4..123c64d9c487 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -79,6 +79,7 @@ static const struct { { HDA_CODEC_ALC221, 0, "Realtek ALC221" }, { HDA_CODEC_ALC222, 0, "Realtek ALC222" }, { HDA_CODEC_ALC225, 0, "Realtek ALC225" }, + { HDA_CODEC_ALC230, 0, "Realtek ALC230" }, { HDA_CODEC_ALC231, 0, "Realtek ALC231" }, { HDA_CODEC_ALC233, 0, "Realtek ALC233" }, { HDA_CODEC_ALC234, 0, "Realtek ALC234" },