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 3324121578F; Thu, 12 Dec 2024 15:52:45 +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=1734018765; cv=none; b=rfI0mqlukmeOUWXUsua+rg31O+vdPBPQOgkmJTvBni69MEYb/LbGTe+Prk4ciStDjUZOiAP40ht9SzoyF8A3s7yrmHlDpKkRrj7phDsWEHfurHO5tOXDoJtRYMPr+H6sa176jEXu0g/k+H7s6kBkpUFtCXBFajqt9M7FGG8SIRI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734018765; c=relaxed/simple; bh=K2JRJa6osjiBE85CUBvKocgL4Gk8BQ2oGk3DMA5lD4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BVsebXUG3csLs6zccGM38htqvAPx2E/M8nfRO86B8wrC68WIzPIDuPBBqus4s676COj/ib9dkS0RwkhJ4mjzfZeCEb92xkgxB2jKSHlDOuAnwMif+qcaEG2/HqPYGC/zjzt7H3Ulq90flT3Oe8gSg9z0NqUvFkCcLeN0qDxWMrU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VpIcy6wz; 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="VpIcy6wz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83926C4CED3; Thu, 12 Dec 2024 15:52:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734018765; bh=K2JRJa6osjiBE85CUBvKocgL4Gk8BQ2oGk3DMA5lD4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VpIcy6wzfnr3NCx85GAH5GLZF8kOCzN4SRuUWmBJ5M85Ch3T+vD+0BhkoCXcB2zWI x/XYgbh08VOT+RZpZkEP5XFBhDBI07jlq1uDV+/nr6nXqZMO0YHoIO6rQW5cDcR9a2 Wzv25u3fBWA846VTXXEb74T2kQKKJUmPV1YTEAyQ= 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.1 026/772] ALSA: usb-audio: Fix Yamaha P-125 Quirk Entry Date: Thu, 12 Dec 2024 15:49:31 +0100 Message-ID: <20241212144351.031764942@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 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