lkml.org 
[lkml]   [2021]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.11 34/67] ALSA: usb-audio: Add support for Pioneer DJM-750
    Date
    From: Olivia Mackintosh <livvy@base.nu>

    [ Upstream commit b952ac76a20bc0b23cd7e22de19fb407713238a3 ]

    This adds the Pioneer DJ DJM-750 to the quirks table and ensures
    skip_pioneer_sync_ep() is (also) called: this device uses the vendor
    ID of 0x08e4 (I'm not sure why they use multiple vendor IDs but many
    just like to be awkward it seems).

    Playback on all 8 channels works. I'll likely keep this working in the
    future and submit futher patches and improvements as necessary.

    Signed-off-by: Olivia Mackintosh <livvy@base.nu>
    Link: https://lore.kernel.org/r/20210118130621.77miiie47wp7mump@base.nu
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/usb/implicit.c | 3 +-
    sound/usb/quirks-table.h | 60 ++++++++++++++++++++++++++++++++++++++++
    2 files changed, 62 insertions(+), 1 deletion(-)

    diff --git a/sound/usb/implicit.c b/sound/usb/implicit.c
    index 521cc846d9d9f..e7216d0b860d8 100644
    --- a/sound/usb/implicit.c
    +++ b/sound/usb/implicit.c
    @@ -302,7 +302,8 @@ static int audioformat_implicit_fb_quirk(struct snd_usb_audio *chip,
    /* Pioneer devices with vendor spec class */
    if (attr == USB_ENDPOINT_SYNC_ASYNC &&
    alts->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC &&
    - USB_ID_VENDOR(chip->usb_id) == 0x2b73 /* Pioneer */) {
    + (USB_ID_VENDOR(chip->usb_id) == 0x2b73 || /* Pioneer */
    + USB_ID_VENDOR(chip->usb_id) == 0x08e4 /* Pioneer */)) {
    if (skip_pioneer_sync_ep(chip, fmt, alts))
    return 1;
    }
    diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
    index c8a4bdf18207c..93d55cd1a5a4c 100644
    --- a/sound/usb/quirks-table.h
    +++ b/sound/usb/quirks-table.h
    @@ -3757,6 +3757,66 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
    }
    }
    },
    +{
    + /*
    + * Pioneer DJ DJM-750
    + * 8 channels playback & 8 channels capture @ 44.1/48/96kHz S24LE
    + */
    + USB_DEVICE_VENDOR_SPEC(0x08e4, 0x017f),
    + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
    + .ifnum = QUIRK_ANY_INTERFACE,
    + .type = QUIRK_COMPOSITE,
    + .data = (const struct snd_usb_audio_quirk[]) {
    + {
    + .ifnum = 0,
    + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
    + .data = &(const struct audioformat) {
    + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
    + .channels = 8,
    + .iface = 0,
    + .altsetting = 1,
    + .altset_idx = 1,
    + .endpoint = 0x05,
    + .ep_attr = USB_ENDPOINT_XFER_ISOC|
    + USB_ENDPOINT_SYNC_ASYNC,
    + .rates = SNDRV_PCM_RATE_44100|
    + SNDRV_PCM_RATE_48000|
    + SNDRV_PCM_RATE_96000,
    + .rate_min = 44100,
    + .rate_max = 96000,
    + .nr_rates = 3,
    + .rate_table = (unsigned int[]) { 44100, 48000, 96000 }
    + }
    + },
    + {
    + .ifnum = 0,
    + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
    + .data = &(const struct audioformat) {
    + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
    + .channels = 8,
    + .iface = 0,
    + .altsetting = 1,
    + .altset_idx = 1,
    + .endpoint = 0x86,
    + .ep_idx = 1,
    + .ep_attr = USB_ENDPOINT_XFER_ISOC|
    + USB_ENDPOINT_SYNC_ASYNC|
    + USB_ENDPOINT_USAGE_IMPLICIT_FB,
    + .rates = SNDRV_PCM_RATE_44100|
    + SNDRV_PCM_RATE_48000|
    + SNDRV_PCM_RATE_96000,
    + .rate_min = 44100,
    + .rate_max = 96000,
    + .nr_rates = 3,
    + .rate_table = (unsigned int[]) { 44100, 48000, 96000 }
    + }
    + },
    + {
    + .ifnum = -1
    + }
    + }
    + }
    +},

    #undef USB_DEVICE_VENDOR_SPEC
    #undef USB_AUDIO_DEVICE
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-02-24 14:46    [W:4.671 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site