diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-11-18 14:39:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-11-18 14:39:29 +0100 |
| commit | 40d6b7e0f42d15c7338824d15fa39bf926a39cf4 (patch) | |
| tree | 82360c2500a5c34956f91e8193d9693c8acab75f /sound/usb | |
| parent | 1a7585c3a4504705a97c1560ff67d589b693115d (diff) | |
| parent | 5ec23a1b53a98dbd7ea33954db5f0fe7110903aa (diff) | |
| download | linux-40d6b7e0f42d15c7338824d15fa39bf926a39cf4.tar.gz linux-40d6b7e0f42d15c7338824d15fa39bf926a39cf4.tar.bz2 linux-40d6b7e0f42d15c7338824d15fa39bf926a39cf4.zip | |
Merge branch 'for-linus' into for-next
Pull 6.12 devel branch for further HD-audio and USB-audio fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/quirks-table.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index b758655b948c..c49383e64678 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), |