Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF2F7C433E6 for ; Mon, 18 Jan 2021 16:42:45 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DE2822BF3 for ; Mon, 18 Jan 2021 16:42:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DE2822BF3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 440FE183B; Mon, 18 Jan 2021 17:41:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 440FE183B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1610988162; bh=uQ4fOcmv5XlDkOeVQlnpVx3/o1ZpuWewTmBNn7QeMeM=; h=Date:From:To:Subject:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=DAayD7appePwEHBpvk7SR+9XsycdnhPbErqzhKl6q63g/xfZ/9NN5P+ZXH4l5Az2Y nKLAttfipO4Wg/ou/cS1CSfv+kiWAwQ6gaidOEfrpxjapUh8ykXPjlFCG/hyz0eVMx VeFxrcsdszW5fsO3BxChUDfPzhbHpm4C7fJGBGfU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B0629F80166; Mon, 18 Jan 2021 17:41:51 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8E666F8016E; Mon, 18 Jan 2021 17:41:49 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6463BF80137 for ; Mon, 18 Jan 2021 17:41:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6463BF80137 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 6DC92B247; Mon, 18 Jan 2021 16:41:42 +0000 (UTC) Date: Mon, 18 Jan 2021 17:41:42 +0100 Message-ID: From: Takashi Iwai To: Olivia Mackintosh Subject: Re: [PATCH] ALSA: usb-audio: Add support for Pioneer DJM-750 In-Reply-To: <20210118130621.77miiie47wp7mump@base.nu> References: <20210118130621.77miiie47wp7mump@base.nu> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: alsa-devel@alsa-project.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Mon, 18 Jan 2021 14:06:21 +0100, Olivia Mackintosh wrote: > > 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 Thanks, applied now to for-next branch, i.e. targeted for 5.12. I'd take for 5.11 if it were a oneliner, but this is a bit too long as a late merge material, unfortunately. Takashi > --- > 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 521cc846d9d9..e7216d0b860d 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 c8a4bdf18207..98b31c3160ad 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.30.0 >