From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 49A9ACA9EC9 for ; Mon, 4 Nov 2019 22:16:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C04D204EC for ; Mon, 4 Nov 2019 22:16:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905818; bh=EAMdQDt1Bh0/+ld61Uyi+Vl71YdSRzIHXTD9npB2VVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NMmY9klXUEqNU2jrGE9UO9l1cD400AxHZRWPtkXbroUcw+RTIM+UoeqCEB8LcZVXl Ewrirl2Mgul9lDhbpJVkMUxxd/pDrOjGlfUVtQGGn+1ZP4UbRmTi2eksaPEVdTFxuS fhRxoLstsPNT6d2d7USVdakJYyReWoEYo9K0iGe4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389375AbfKDWQx (ORCPT ); Mon, 4 Nov 2019 17:16:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:33818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389515AbfKDWDa (ORCPT ); Mon, 4 Nov 2019 17:03:30 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C5575214D8; Mon, 4 Nov 2019 22:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905009; bh=EAMdQDt1Bh0/+ld61Uyi+Vl71YdSRzIHXTD9npB2VVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jS11C8VrnMftlDcSY5Mt+Cod8iXpI9rMBi5QYe5nUlI1plmyeYs7Bk3buakEEBoDb FFWGS9ercxNwABqchDIyB/C4nc1T7QThGBo88bDtQfYMVlaIhEX2ZMRI+AF9RQvUgI FfHdL0Lbp4FpRwnrIoGOgNLOIxziipYUpnfuB968= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jussi Laako , Takashi Iwai , Sasha Levin Subject: [PATCH 4.19 147/149] ALSA: usb-audio: DSD auto-detection for Playback Designs Date: Mon, 4 Nov 2019 22:45:40 +0100 Message-Id: <20191104212146.986443597@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212126.090054740@linuxfoundation.org> References: <20191104212126.090054740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jussi Laako [ Upstream commit eb7505d52a2f8b0cfc3fd7146d8cb2dab5a73f0d ] Add DSD support auto-detection for newer Playback Designs devices. Older device generations have a different USB interface implementation. Keep the auto-detection VID whitelist sorted. Signed-off-by: Jussi Laako Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/quirks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index e5dde06c31a6f..0a8a0978a2dba 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1343,7 +1343,8 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, struct usb_interface *iface; /* Playback Designs */ - if (USB_ID_VENDOR(chip->usb_id) == 0x23ba) { + if (USB_ID_VENDOR(chip->usb_id) == 0x23ba && + USB_ID_PRODUCT(chip->usb_id) < 0x0110) { switch (fp->altsetting) { case 1: fp->dsd_dop = true; @@ -1431,8 +1432,9 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, * from XMOS/Thesycon */ switch (USB_ID_VENDOR(chip->usb_id)) { - case 0x20b1: /* XMOS based devices */ case 0x152a: /* Thesycon devices */ + case 0x20b1: /* XMOS based devices */ + case 0x23ba: /* Playback Designs */ case 0x25ce: /* Mytek devices */ case 0x2ab6: /* T+A devices */ case 0x3842: /* EVGA */ -- 2.20.1