From patchwork Fri Jun 23 13:20:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 112138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5783764vqr; Fri, 23 Jun 2023 06:45:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6GLC9x54J/f3+1tliis7/MSG6y7JJRLJbgYDrHUxfXjNsZtRAaXefHwbKZPTFy8AuY6Qm3 X-Received: by 2002:a05:6a20:549b:b0:125:a429:a19c with SMTP id i27-20020a056a20549b00b00125a429a19cmr2272832pzk.48.1687527937499; Fri, 23 Jun 2023 06:45:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687527937; cv=none; d=google.com; s=arc-20160816; b=W9oxtST6W8dyAbcPpnK8T+GpxIVTiiS1Wj32G43+GEi/6uIaJWsYXGuS7tEmM3BfQ0 FBfFiG6jaYCD2usbiqK1F0bwdP/oLTdtiqDSo7DIY8wbHzMnxhREd4zgJ3Mf/to1Z6yE nPzFt0qA/ZYGYaRJUrfTx06aFWRpRp8px2oDdiLqK2qxCT7eOAOj0m5HbBvMVGHf9WEL YKv5hh5Rb+Fad9RmWy16Oxfs8i6J8tzDJGtSuQNYNeQRhAhFF3GmqHH8UpKjood6P/4W 4TsizV5U0cZeKoZrPjvhYsci+PnMhRL5OaG5P2BAfCqQ1OW0YPXD+hoiSxgKTrp7kwMJ rvyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:subject:cc:to:from :message-id:date:dkim-signature:dkim-signature; bh=HR2cnKetgtyF4HmEnS3dEntpxT3sXcuGNxVsg9FcfzM=; b=MUAu1VHKiWhBJCfGZYaxhuzEH0dJPFkshIKZqg0FM+J5m8rD2E2O0aOibTeuC6pMIU aLMd04UD0E474erU0TNz5qT8AC7mysj21WhkrAejFgON9VRRv53XgFg+4GEWA6DmUdmP MK//TjKeiz1SmLGLpO3PGD2lUau4Zu6UfUL8XzGZNC7JH0YJYlnFnD20iPttpawGfvF6 tSbWIkSvKP+QIOby5kSPjlklfFh6KU5dfXe9ByRm7GoQQWQPgLfmL4jKeS8N4UKGqGnF U/0rGH4opgokEWxDCJc5mlvE0SYAagDMirwbofegfxZdv+pZD0je9YvflPVx8GPLqB3o qiBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Wdt9Lth3; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="x+msr6/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k15-20020a170902c40f00b001b6819b6238si4904140plk.195.2023.06.23.06.45.23; Fri, 23 Jun 2023 06:45:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Wdt9Lth3; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="x+msr6/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230330AbjFWNUh (ORCPT + 99 others); Fri, 23 Jun 2023 09:20:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229647AbjFWNUg (ORCPT ); Fri, 23 Jun 2023 09:20:36 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07C08171E for ; Fri, 23 Jun 2023 06:20:28 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 453391F38D; Fri, 23 Jun 2023 13:20:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1687526427; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=HR2cnKetgtyF4HmEnS3dEntpxT3sXcuGNxVsg9FcfzM=; b=Wdt9Lth3hlWzW/6CN8Jdusli8kShNm7hcUNvr4yWp7osFYsHs4jF8zIgVcR14BPRyVpPCi Sb4GjBhzxVlPkAU+07i/ic/NVgexP5TuwXvxIqK5FQSKgOqQXJUUhbZAvjWIey/AN2H6xH ZX+X6pQ5FlbwqO8aqPPdhAgowDHlZFs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1687526427; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=HR2cnKetgtyF4HmEnS3dEntpxT3sXcuGNxVsg9FcfzM=; b=x+msr6/4JVlsCYF8s1aGcm3We4Y3W9Hg83UaZT3RmbR7F0QCdZhFQsga4ZD5gMH2L65qZP wSmf4dpUzKNgY2Dg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 221EE1331F; Fri, 23 Jun 2023 13:20:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id lWqHBxuclWQcSgAAMHmgww (envelope-from ); Fri, 23 Jun 2023 13:20:27 +0000 Date: Fri, 23 Jun 2023 15:20:26 +0200 Message-ID: <87352ixqlh.wl-tiwai@suse.de> From: Takashi Iwai To: Linus Torvalds Cc: Mark Brown , Liam Girdwood , Linux Kernel Mailing List Subject: [GIT PULL] sound fixes for 6.4-final User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/27.2 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE,T_SPF_HELO_TEMPERROR,T_SPF_TEMPERROR, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769501294099419304?= X-GMAIL-MSGID: =?utf-8?q?1769501294099419304?= Linus, please pull sound fixes for v6.4-final from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-6.4 The topmost commit is 6f9441f4e3ebf86b8a0427f14ee1753f2183a3cf ---------------------------------------------------------------- sound fixes for 6.4-final Three oneliner fixes: one for a thinko in SOF SoundWire code and two HD-audio quirks for ASUS laptops. All device-specific and should be safe to apply. ---------------------------------------------------------------- Charles Keepax (1): ASoC: intel: sof_sdw: Fixup typo in device link checking Luke D. Jones (2): ALSA: hda/realtek: Add quirk for ASUS ROG G634Z ALSA: hda/realtek: Add quirk for ASUS ROG GV601V --- sound/pci/hda/patch_realtek.c | 2 ++ sound/soc/intel/boards/sof_sdw.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 308ec7034cc9..dabfdecece26 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9527,6 +9527,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), SND_PCI_QUIRK(0x1043, 0x1473, "ASUS GU604V", ALC285_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1483, "ASUS GU603V", ALC285_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x1493, "ASUS GV601V", ALC285_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2), @@ -9552,6 +9553,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS), + SND_PCI_QUIRK(0x1043, 0x1caf, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 6faf4a43eaf5..144f082c63fd 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1347,7 +1347,7 @@ static int sof_card_dai_links_create(struct device *dev, if ((SDW_PART_ID(adr_link->adr_d[i].adr) != SDW_PART_ID(adr_link->adr_d[j].adr)) || (SDW_MFG_ID(adr_link->adr_d[i].adr) != - SDW_MFG_ID(adr_link->adr_d[i].adr))) { + SDW_MFG_ID(adr_link->adr_d[j].adr))) { append_codec_type = true; goto out; }