From patchwork Tue Feb 6 09:14:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-Lo=C3=AFc_Charroud?= X-Patchwork-Id: 197274 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1416059dyb; Tue, 6 Feb 2024 01:17:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IHR2L8+fd86SfhAIaVPc/BZ4uPuo4Buuh0BRuqnSTtv1BPp6DmcLDZzxyrM9fxGD24LKVVf X-Received: by 2002:a17:902:6803:b0:1d9:4ede:66c0 with SMTP id h3-20020a170902680300b001d94ede66c0mr939499plk.40.1707211023108; Tue, 06 Feb 2024 01:17:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707211023; cv=pass; d=google.com; s=arc-20160816; b=TuIg8fNUey/aur9YnWCjMRpZg50XNWMKDE9AuH7kcvPoTH9ycO6Gh3dw/2Xn48+5Yg kyl4w+MEFOg5aONvAu1dpK3HZFMNjWWU5drL6YCqAgHomEbHmlJ1hRNTf6vAyDye/UM5 9MIC4RhCNRYgnaDEUAIp3aeoMbISy49+dGX94ndke2zuGXeHu2veidNxTwPmXIrVQv74 mFwiAgUR6hrJZX/rwiNDUpoobUYa+wosBzMtHfOR19yUKR5OJFypjPMv7AHq/cjyX0kq 6nPncE4CLJ+yLIsZ37wA/BAwWOLmlAS+yA06rTAtkYA2qjJxTkOLtmzDGmlUf6OU5mPk lMLA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:date:message-id; bh=6CQwWfRyoySXmQHADhVhfuhax+hCi/vkTBjPG/MnHWI=; fh=dJ7djAlTArUQGBfWdGC+0Ud4dc6jnP+aCKf14lOce+M=; b=MuBOCMAO4uKtsCblj6owedAt4Fu07G9csGoN4/7qyBlELgwhw1KVx7mcIP+H/jxxrS J8ytP6xbhQgocRbXGRjwIsFv8stbh/mfDPW1gRjUS5cVc0vbr1E1s/Ucc99Sadt9DHo1 MhnPzig9vjzLOc+xpTGPctqAaYIASrmMjQLwrDFs+dJepxxCh3vWcDnx+YPeanbt7rJz JtfGPZDZJDiRNs4HuESh2unbC2uI/hKqJO/5OWUTrMwGDSFoB5eVyxrWVAnwDWzh/YDQ k0kQO77HW9swwATzyDUWUrGLT8q2UuPVnNZPB160YkJMkMgEQhqp2CUesSdNB1+/8DHf HZrg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=free.fr dmarc=pass fromdomain=free.fr); spf=pass (google.com: domain of linux-kernel+bounces-54567-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54567-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=free.fr X-Forwarded-Encrypted: i=1; AJvYcCUwHcrhK2TUCZcbuNuyq0+bq54G2oSQWB6WAnpJ63fwztcSs5EFAB7Y8Ms7sypgz5k0EC7U1ms7e6JAj280fDEyTF7/7Q== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id g1-20020a170902740100b001d953f4021csi1354452pll.196.2024.02.06.01.17.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 01:17:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54567-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=free.fr dmarc=pass fromdomain=free.fr); spf=pass (google.com: domain of linux-kernel+bounces-54567-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54567-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=free.fr Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id AE106B22FFB for ; Tue, 6 Feb 2024 09:14:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 59F6E12D14C; Tue, 6 Feb 2024 09:14:24 +0000 (UTC) Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2C685B687; Tue, 6 Feb 2024 09:14:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.27.42.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707210862; cv=none; b=TUzaRRJj0/lF1aSA7PsdUisXCP1PEVL1vZLZP5KiF58TvEAx01s6pvWKuNU+HWfW5g6jXZjRw75v5d/LiqceG8hNKVEjxq2Mr2ILM5lIJNZVNlkkPxGh5oHKD/7KoSFjs2iiVmDO7M5y7rqggCslKrt8RZNK9SY9ozFaCWOSmT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707210862; c=relaxed/simple; bh=bEoN3M17mEv9B3162HEP9uHxhQ9Pp2M9knWH2/SA5EY=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:Content-Type; b=kwF1dzDrNwRvXfKguHF6AkKS7nhvX7p+iwKCq626HIlHQcW37FH3u5QpQdxJy1lWMsMKEUTYXobq9M+rxzNw9OUgzg4kLdQG3hZ1/fSc/Dnj5onx1kAR51DjUn4DxC04gnY56ssGs9V79Akh2VISlhb6IQSxRl12RIDPzKZIxas= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=free.fr; spf=pass smtp.mailfrom=free.fr; arc=none smtp.client-ip=212.27.42.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=free.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=free.fr Received: from [IPV6:2a01:e34:ec1e:c710:76bc:3b92:8186:7430] (unknown [IPv6:2a01:e34:ec1e:c710:76bc:3b92:8186:7430]) (Authenticated sender: lagiraudiere@free.fr) by smtp2-g21.free.fr (Postfix) with ESMTPSA id 0F4BA2005A5; Tue, 6 Feb 2024 10:14:04 +0100 (CET) Message-ID: Date: Tue, 6 Feb 2024 10:14:04 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: =?utf-8?q?Jean-Lo=C3=AFc_Charroud?= Subject: [PATCH] ALSA: hda/realtek: cs35l41: Fix internal speaker support for ASUS UM3402 with missing DSD To: Stefan Binding , Jaroslav Kysela , Takashi Iwai Cc: Richard Fitzgerald , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Content-Language: en-US, fr-FR X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790140505812702363 X-GMAIL-MSGID: 1790140505812702363 Fix device ID for "ASUS UM3402" and "ASUS UM6702RA/RC". Add DSD values for "ASUS UM3402" to cs35l41_config_table[]. Reorder alc269_fixup_tbl[] by device id and remove duplicate QUIRK entry for device {0x1043, 0x1f62, "ASUS UX7602ZM"}. Signed-off-by: Jean-Loïc Charroud ---  sound/pci/hda/cs35l41_hda_property.c | 2 ++  sound/pci/hda/patch_realtek.c        | 7 +++----  2 files changed, 5 insertions(+), 4 deletions(-) +    SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),      SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),      SND_PCI_QUIRK(0x1043, 0x16d3, "ASUS UX5304VA", ALC245_FIXUP_CS35L41_SPI_2),      SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), @@ -9936,14 +9937,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {      SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),      SND_PCI_QUIRK(0x1043, 0x1da2, "ASUS UP6502ZA/ZD", ALC245_FIXUP_CS35L41_SPI_2),      SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2), -    SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2), -    SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),      SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502), -    SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2), +    SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),      SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),      SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),      SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401), -    SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2), +    SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),      SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401),      SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),      SND_PCI_QUIRK(0x1043, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2), diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c index 923c0813fa08..d8cd62ef6afc 100644 --- a/sound/pci/hda/cs35l41_hda_property.c +++ b/sound/pci/hda/cs35l41_hda_property.c @@ -102,6 +102,7 @@ static const struct cs35l41_config cs35l41_config_table[] = {      { "10431D1F", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },      { "10431DA2", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },      { "10431E02", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, +    { "10431E12", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },      { "10431EE2", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },      { "10431F12", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },      { "10431F1F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 0, 0, 0 }, @@ -485,6 +486,7 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = {      { "CSC3551", "10431D1F", generic_dsd_config },      { "CSC3551", "10431DA2", generic_dsd_config },      { "CSC3551", "10431E02", generic_dsd_config }, +    { "CSC3551", "10431E12", generic_dsd_config },      { "CSC3551", "10431EE2", generic_dsd_config },      { "CSC3551", "10431F12", generic_dsd_config },      { "CSC3551", "10431F1F", generic_dsd_config }, diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7aa88ed04bde..16cb19eee589 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9893,6 +9893,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {      SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),      SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZI/ZJ/ZQ/ZU/ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),      SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),