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 787291F7591; Tue, 3 Dec 2024 14:54:47 +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=1733237687; cv=none; b=jyNTyl5dcva7rOwteapwFicy3QnF2VkWgsx5lEpx94yHlmbUr1NFqF10mVd7O+hQjddVPQ1ZMkFpuQBKgPvfqteEktboCS64wrH2c81GtS3xXgRV1rvI11ayoXWdaDw74RWx3Zkwdu81AUGhlLK/0vx/yN6dAAlp5y0Qgmh6Ll0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733237687; c=relaxed/simple; bh=UbmeL7w82q9B+bkd5AE67C37efUhQCPS0vcjPNlVQBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DjIaT7rAah8ucUfdAA4K7XnYpbwyQRLhDvaFuvw+FU5mt7+h5WFWjbgeUp1SVbEes+iNGL2U5r/2mIAMe8sCJ4zSf+/YLL9wN5poePd99HtQzTYA6Wq2AHTv4Q2PBo42EpR9aZNxZFR7qs5kzc/fYilS/IWgi/NmqKbSk+mV0Jk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hnHLfDXH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hnHLfDXH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A6B5C4CED8; Tue, 3 Dec 2024 14:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733237687; bh=UbmeL7w82q9B+bkd5AE67C37efUhQCPS0vcjPNlVQBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hnHLfDXHMmKQJE7h7Kj/2ykDcT+9hS5ha6H86rxcUpFp34ilKu+pnaxFIJ0fngZ4J FEs1Bp4g7GBGGwwag/afDzH59QjdsSEizjDgfHxRFN9xoNh8Syf+K4FCgYv5wR4vEh H6jBnBbV4rwsfDW5BgTNnBl2LHZKzuy2lNQN0M0g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eryk Zagorski , Takashi Iwai , Sasha Levin Subject: [PATCH 6.11 042/817] ALSA: usb-audio: Fix Yamaha P-125 Quirk Entry Date: Tue, 3 Dec 2024 15:33:34 +0100 Message-ID: <20241203143957.301917525@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ 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 24c981c9b2405..199d0603cf8e5 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