From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1E6AA1BAEFC; Wed, 20 Nov 2024 14:06:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732111618; cv=none; b=Ddfvs1Hms79a9CB0WDdUIb2nzZOeVpbd0Nghs2Web6mHi+Qz8KwPFips1EF2TBinsfva+4tvfMmZbM7plBw6JnzsPx2JGQcLO55Kk+uJd4c8EqoZ/I9znDTf+XZmg7F0mfJTMHgCWsgVnKwILTcUCim4TN1Y6vrrk/esayyWdLI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732111618; c=relaxed/simple; bh=g/fDauAIwxP9y+zEDZ7jVmGSEPPMIjIzGldIfN7Ozfw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dr2Z+b/wIc0Yhi+VUcxDv01S+o5n3dmg0rSCWFhASfeetVntWBtRKose+1l5OfnhlBY+Y+VIjLeiGY13dJVdx+8GhBbd0ot5A2/TmjErRcaGOtuUFLxpmBQBAtzMxzmvmHoiIp85La5/VIn7oGYOIZioiGOWHrySXzictx4ntxQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bKG1FURj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bKG1FURj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABA59C4CECD; Wed, 20 Nov 2024 14:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732111618; bh=g/fDauAIwxP9y+zEDZ7jVmGSEPPMIjIzGldIfN7Ozfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bKG1FURj1eorEl/tUP/2ZA32OP+pFEkrm7xJyFpZAadGQ2QSr+txqjbHZAaMMq0Bq MCPTHlmhq+EX/voFRNt7mo03wYjsQn2XKbC8gfFPg7Uh8lWXCtI1MrOAGDFPMlTFBC 3gtFZ5CY4GnN6dHOkhTDo8FhtPh6wAKSN6R36fFLrVKisuNez88e3G6homA6YGrP9z nSdfsRCLwibj1y+WdDbKdxmMe5MJt0RcZ4ofdrOd7mH59FIhSfeYCt68RqGRv33wrR lV4hFtMvMGqTiAzKqcg2pgNqAxNGaPylTqLpDvgykhKS1RGcA10FKIusuVQStinO/0 ZKHHm/o8vH8Gg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eryk Zagorski , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, lina@asahilina.net, cyan.vtb@gmail.com, soyjuanarbol@gmail.com, mbarriolinares@gmail.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 3/6] ALSA: usb-audio: Fix Yamaha P-125 Quirk Entry Date: Wed, 20 Nov 2024 09:06:33 -0500 Message-ID: <20241120140647.1768984-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241120140647.1768984-1-sashal@kernel.org> References: <20241120140647.1768984-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.62 Content-Transfer-Encoding: 8bit From: Eryk Zagorski [ Upstream commit 6f891ca15b017707840c9e7f5afd9fc6cfd7d8b1 ] This patch switches the P-125 quirk entry to use a composite quirk as the P-125 supplies both MIDI and Audio like many of the other Yamaha keyboards Signed-off-by: Eryk Zagorski Link: https://patch.msgid.link/20241111164520.9079-2-erykzagorski@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/quirks-table.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 75cde5779f38d..d1bd8e0d60252 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -324,7 +324,6 @@ YAMAHA_DEVICE(0x105a, NULL), YAMAHA_DEVICE(0x105b, NULL), YAMAHA_DEVICE(0x105c, NULL), YAMAHA_DEVICE(0x105d, NULL), -YAMAHA_DEVICE(0x1718, "P-125"), { USB_DEVICE(0x0499, 0x1503), QUIRK_DRIVER_INFO { @@ -391,6 +390,19 @@ YAMAHA_DEVICE(0x1718, "P-125"), } } }, +{ + USB_DEVICE(0x0499, 0x1718), + QUIRK_DRIVER_INFO { + /* .vendor_name = "Yamaha", */ + /* .product_name = "P-125", */ + QUIRK_DATA_COMPOSITE { + { QUIRK_DATA_STANDARD_AUDIO(1) }, + { QUIRK_DATA_STANDARD_AUDIO(2) }, + { QUIRK_DATA_MIDI_YAMAHA(3) }, + QUIRK_COMPOSITE_END + } + } +}, YAMAHA_DEVICE(0x2000, "DGP-7"), YAMAHA_DEVICE(0x2001, "DGP-5"), YAMAHA_DEVICE(0x2002, NULL), -- 2.43.0