Received: by 2002:ab2:6203:0:b0:1f5:f2ab:c469 with SMTP id o3csp2757154lqt; Mon, 22 Apr 2024 23:52:34 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWzqWsDNS9BMqUorkKA7ZZrkY0GpbW6ifnhReqpbzAmnnrrDU44DQzCYHIJP+x5kxwOhcHIh9dLs7Ni+RwUiioDTUhb//dWnzYuSYGWnw== X-Google-Smtp-Source: AGHT+IFT1VgbCbIwBKP8znyADdOxGdBObZ86fA6WgNedIddI8jCGWKngaAiy+Vr4YIX1Ahp1cMs9 X-Received: by 2002:ac8:5896:0:b0:434:f3c9:8002 with SMTP id t22-20020ac85896000000b00434f3c98002mr13278005qta.42.1713855153587; Mon, 22 Apr 2024 23:52:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713855153; cv=pass; d=google.com; s=arc-20160816; b=ds2jdzB05QxLaFq8A1tt8y5ODiSyZIZxZMrwHZKGWqsjRa4AHO+874kqqx7UpWYIsN b7hNJzJPqqzeU2lBN4yLMRJBdcb1C2MFRTTPzSjxXRTc+TJNblQ4sH9M8+W4wfOmr1Js fvDB/MEO56VhNx3tKWF+KZQ5gdQD0YkjZM/JQOcw8POYvWIMmFfOl1vbHdlv2uTaUaZL ftFYcUenIRXW9/AvvbVIAemiSLlEkYPnn3fWeWdeotM0+nobd5EWAdHz8YS0zlb541sQ vaP8NRmTbww2/TTqN7J5jA+Zq+01l2CMfIMxI1fW3I7Y5TUL08N2jzZr7w4GjJbsXqi2 0FoA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=d/YynPX2d9Z73YJBkHV9wjSEs0O6Z0K9fATT2DtRl0E=; fh=39U+01qV+lp+AzDfG5eTmeTb+H31wyncdFUOQtLuflI=; b=DqKeNIL3lHCojwxX1SKV82YkzCJGiJnfEiF3WveM6Tm9kWPlRnZxZbpReh9MYxgHiE Xlu58v/4M2p5MirLmgVRVarpKd3pLR7eZ+g0iUmdY5QXopQPJ1S+KFdVyUYOPSOcjTue 3oVf9TAFmt4dNQDa6qRBeKIYx5nQmPAhDmcMEHylv41lUdBDHThf+87IHq0c6r4mQtri JEqFUKSJ0oXwQ0wgm8G2cz3AzynCA13+nQM6N/74Og/knlykmXBbyULg+o1SZ3uAowPt olyjEm5ZvO7P8XRTVKtNlgwB1npG8iRCTpZNCuYT9O28i5cj3L34795L502f2pPbgpCR XI5Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=KYIsWhNt; arc=pass (i=1 spf=pass spfdomain=mediatek.com dkim=pass dkdomain=mediatek.com dmarc=pass fromdomain=mediatek.com); spf=pass (google.com: domain of linux-kernel+bounces-154576-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154576-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id z14-20020a05622a028e00b00439b41ac4d2si4036699qtw.518.2024.04.22.23.52.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 23:52:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-154576-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=KYIsWhNt; arc=pass (i=1 spf=pass spfdomain=mediatek.com dkim=pass dkdomain=mediatek.com dmarc=pass fromdomain=mediatek.com); spf=pass (google.com: domain of linux-kernel+bounces-154576-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154576-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 41A101C2175B for ; Tue, 23 Apr 2024 06:52:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 46F4024B28; Tue, 23 Apr 2024 06:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="KYIsWhNt" Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (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 94ACB23759; Tue, 23 Apr 2024 06:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713855143; cv=none; b=tIfuwVjf5uGUd6bm1WM4Tk5ySPszMn0Afx1lUmvJgFUvcVNFvKEWTcbzYMjegT0fELWfg+utA+616c3QZU5uHiMY4g2q1OXep7UMIxH2Ei3tZySqf2AMH6b75AY30hiuG/QQoZ8UxwFtaz84xIMZD4LCs/+AKeTqYK8i9nCwxUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713855143; c=relaxed/simple; bh=o4WpBIpjBLDYeKui6uCsgtyKAoQmJ7l/js+lZCGpln0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pqiofiyOgKIjKMNTpSuXJRe+k5u9Vho+dMnR5RgTGhnzvP8B924r0IlG4KES9Z6zeCsegXzBMOSxHWfsjhjtS08OifhbkI7/JmDdzoqmnsls0U74dyLuyCD2lFrUFPADvBEtpB0S8+gBCCA5tK2Kb7xPH07GeiQ87ySZptwtJZg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=KYIsWhNt; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com X-UUID: 01f90660013e11ef935d6952f98a51a9-20240423 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=d/YynPX2d9Z73YJBkHV9wjSEs0O6Z0K9fATT2DtRl0E=; b=KYIsWhNtaydwP28DCIg3n4yPYsz5fFcfntrAzqCqG+PMdHCX8mHFQuN/GRY0UZjTa7gop1ecj8LW843R+Sa11WJ87cmRcasViV8xXX0/N+MxxllgcR7m58fMd9PwCoTMJ6NoTgJR1pqoXgSZhBCRgxDCtqmTaUetgoqKb2suV8A=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.38,REQID:b9e17699-74a8-472d-9d81-1f897cc2021a,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:82c5f88,CLOUDID:76e1e791-e2c0-40b0-a8fe-7c7e47299109,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES :1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: 01f90660013e11ef935d6952f98a51a9-20240423 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1635214590; Tue, 23 Apr 2024 14:52:10 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by MTKMBS09N2.mediatek.inc (172.21.101.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 22 Apr 2024 23:52:09 -0700 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Tue, 23 Apr 2024 14:52:09 +0800 From: Jiande Lu To: Marcel Holtmann , Johan Hedberg , Luiz Von Dentz CC: Sean Wang , Chris Lu , Deren Wu , Aaron Hou , Steve Lee , linux-bluetooth , linux-kernel , linux-mediatek , Jiande Lu Subject: [PATCH v5 2/2] Bluetooth: btusb: Sort usb_device_id table by the ID Date: Tue, 23 Apr 2024 14:51:57 +0800 Message-ID: <20240423065157.21805-2-jiande.lu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240423065157.21805-1-jiande.lu@mediatek.com> References: <20240423065157.21805-1-jiande.lu@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sort usb device id table for enhanced readability. Signed-off-by: Jiande Lu --- drivers/bluetooth/btusb.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 550f7c775942..ce424bf8e5dd 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -588,6 +588,9 @@ static const struct usb_device_id quirks_table[] = { { USB_DEVICE(0x0489, 0xe0c8), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, + { USB_DEVICE(0x0489, 0xe0cd), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH | + BTUSB_VALID_LE_STATES }, { USB_DEVICE(0x0489, 0xe0e0), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, @@ -597,6 +600,9 @@ static const struct usb_device_id quirks_table[] = { { USB_DEVICE(0x04ca, 0x3802), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, + { USB_DEVICE(0x0e8d, 0x0608), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH | + BTUSB_VALID_LE_STATES }, { USB_DEVICE(0x13d3, 0x3563), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, @@ -612,12 +618,6 @@ static const struct usb_device_id quirks_table[] = { { USB_DEVICE(0x13d3, 0x3583), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x0489, 0xe0cd), .driver_info = BTUSB_MEDIATEK | - BTUSB_WIDEBAND_SPEECH | - BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x0e8d, 0x0608), .driver_info = BTUSB_MEDIATEK | - BTUSB_WIDEBAND_SPEECH | - BTUSB_VALID_LE_STATES }, { USB_DEVICE(0x13d3, 0x3606), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, @@ -634,12 +634,6 @@ static const struct usb_device_id quirks_table[] = { { USB_DEVICE(0x0489, 0xe0d9), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x0489, 0xe0f5), .driver_info = BTUSB_MEDIATEK | - BTUSB_WIDEBAND_SPEECH | - BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x13d3, 0x3568), .driver_info = BTUSB_MEDIATEK | - BTUSB_WIDEBAND_SPEECH | - BTUSB_VALID_LE_STATES }, { USB_DEVICE(0x0489, 0xe0e2), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, @@ -664,22 +658,25 @@ static const struct usb_device_id quirks_table[] = { { USB_DEVICE(0x04ca, 0x3804), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x35f5, 0x7922), .driver_info = BTUSB_MEDIATEK | + { USB_DEVICE(0x04ca, 0x38e4), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x13d3, 0x3614), .driver_info = BTUSB_MEDIATEK | + { USB_DEVICE(0x13d3, 0x3568), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x13d3, 0x3615), .driver_info = BTUSB_MEDIATEK | + { USB_DEVICE(0x13d3, 0x3605), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x04ca, 0x38e4), .driver_info = BTUSB_MEDIATEK | + { USB_DEVICE(0x13d3, 0x3607), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x13d3, 0x3605), .driver_info = BTUSB_MEDIATEK | + { USB_DEVICE(0x13d3, 0x3614), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, - { USB_DEVICE(0x13d3, 0x3607), .driver_info = BTUSB_MEDIATEK | + { USB_DEVICE(0x13d3, 0x3615), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH | + BTUSB_VALID_LE_STATES }, + { USB_DEVICE(0x35f5, 0x7922), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, -- 2.18.0