From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 11/11] mmc: sdio: Sort all SDIO IDs in common include file Date: Fri, 22 May 2020 16:44:12 +0200 Message-Id: <20200522144412.19712-12-pali@kernel.org> In-Reply-To: <20200522144412.19712-1-pali@kernel.org> References: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: brcm80211-dev-list.pdl@broadcom.com, libertas-dev@lists.infradead.org, Xinming Hu , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Amitkumar Karwar , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Ganapathi Bhat , ath10k@lists.infradead.org, Matthias Brugger , Mauro Carvalho Chehab , brcm80211-dev-list@cypress.com, Kalle Valo , b43-dev@lists.infradead.org Rml4IG9yZGVyaW5nIG9mIFNESU8gSURzIHRvIGNvbmZvcm0gdG8gdGhlIGNvbW1lbnQgYWJvdmUs IHdoaWNoIHNheXMgdmVuZG9yCmZpcnN0LCBkZXZpY2UgbmV4dC4KClNpZ25lZC1vZmYtYnk6IFBh bGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+Ci0tLQogaW5jbHVkZS9saW51eC9tbWMvc2Rpb19p ZHMuaCB8IDQzICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmggYi9pbmNsdWRlL2xpbnV4L21tYy9zZGlvX2lkcy5o CmluZGV4IGIxOTIwMGFlYTU2YS4uMTVlZDhjZTlkMzk0IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xp bnV4L21tYy9zZGlvX2lkcy5oCisrKyBiL2luY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmgKQEAg LTI1LDkgKzI1LDIzIEBACiAgKiBWZW5kb3JzIGFuZCBkZXZpY2VzLiAgU29ydCBrZXk6IHZlbmRv ciBmaXJzdCwgZGV2aWNlIG5leHQuCiAgKi8KIAorI2RlZmluZSBTRElPX1ZFTkRPUl9JRF9TVEUJ CQkweDAwMjAKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfU1RFX0NXMTIwMAkJMHgyMjgwCisKKyNk ZWZpbmUgU0RJT19WRU5ET1JfSURfSU5URUwJCQkweDAwODkKKyNkZWZpbmUgU0RJT19ERVZJQ0Vf SURfSU5URUxfSVdNQzMyMDBXSU1BWAkweDE0MDIKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfSU5U RUxfSVdNQzMyMDBXSUZJCTB4MTQwMworI2RlZmluZSBTRElPX0RFVklDRV9JRF9JTlRFTF9JV01D MzIwMFRPUAkweDE0MDQKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfSU5URUxfSVdNQzMyMDBHUFMJ MHgxNDA1CisjZGVmaW5lIFNESU9fREVWSUNFX0lEX0lOVEVMX0lXTUMzMjAwQlQJCTB4MTQwNgor I2RlZmluZSBTRElPX0RFVklDRV9JRF9JTlRFTF9JV01DMzIwMFdJTUFYXzJHNQkweDE0MDcKKwog I2RlZmluZSBTRElPX1ZFTkRPUl9JRF9DR1VZUwkJCTB4MDA5MgogI2RlZmluZSBTRElPX0RFVklD RV9JRF9DR1VZU19FV19DRzExMDJHQwkweDAwMDQKIAorI2RlZmluZSBTRElPX1ZFTkRPUl9JRF9U SQkJCTB4MDA5NworI2RlZmluZSBTRElPX0RFVklDRV9JRF9USV9XTDEyNzEJCTB4NDA3NgorCiAj ZGVmaW5lIFNESU9fVkVORE9SX0lEX0FUSEVST1MJCQkweDAyNzEKICNkZWZpbmUgU0RJT19ERVZJ Q0VfSURfQVRIRVJPU19BUjYwMDNfMDAJMHgwMzAwCiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX0FU SEVST1NfQVI2MDAzXzAxCTB4MDMwMQpAQCAtNDEsMzQgKzU1LDI2IEBACiAKICNkZWZpbmUgU0RJ T19WRU5ET1JfSURfQlJPQURDT00JCQkweDAyZDAKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJP QURDT01fTklOVEVORE9fV0lJCTB4MDQ0YgotI2RlZmluZSBTRElPX0RFVklDRV9JRF9CUk9BRENP TV80MzE0MwkJMHhhODg3CiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzMjQxCQkw eDQzMjQKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJPQURDT01fNDMyOQkJMHg0MzI5CiAjZGVm aW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzMzAJCTB4NDMzMAogI2RlZmluZSBTRElPX0RF VklDRV9JRF9CUk9BRENPTV80MzM0CQkweDQzMzQKLSNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJP QURDT01fNDMzNDAJCTB4YTk0YwotI2RlZmluZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV80MzM0 MQkJMHhhOTRkCiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzMzVfNDMzOQkweDQz MzUKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJPQURDT01fNDMzOQkJMHg0MzM5Ci0jZGVmaW5l IFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzMzYyCQkweGE5NjIKLSNkZWZpbmUgU0RJT19ERVZJ Q0VfSURfQlJPQURDT01fNDMzNjQJCTB4YTlhNAotI2RlZmluZSBTRElPX0RFVklDRV9JRF9CUk9B RENPTV80MzQzMAkJMHhhOWE2CiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzNDUJ CTB4NDM0NQotI2RlZmluZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV80MzQ1NQkJMHhhOWJmCiAj ZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzNTQJCTB4NDM1NAorI2RlZmluZSBTRElP X0RFVklDRV9JRF9CUk9BRENPTV9DWVBSRVNTXzg5MzU5CTB4NDM1NQogI2RlZmluZSBTRElPX0RF VklDRV9JRF9CUk9BRENPTV80MzU2CQkweDQzNTYKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJP QURDT01fNDM1OQkJMHg0MzU5CiAjZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NX0NZUFJF U1NfNDM3MwkweDQzNzMKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJPQURDT01fQ1lQUkVTU180 MzAxMgkweGE4MDQKLSNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJPQURDT01fQ1lQUkVTU184OTM1 OQkweDQzNTUKLQotI2RlZmluZSBTRElPX1ZFTkRPUl9JRF9JTlRFTAkJCTB4MDA4OQotI2RlZmlu ZSBTRElPX0RFVklDRV9JRF9JTlRFTF9JV01DMzIwMFdJTUFYCTB4MTQwMgotI2RlZmluZSBTRElP X0RFVklDRV9JRF9JTlRFTF9JV01DMzIwMFdJRkkJMHgxNDAzCi0jZGVmaW5lIFNESU9fREVWSUNF X0lEX0lOVEVMX0lXTUMzMjAwVE9QCTB4MTQwNAotI2RlZmluZSBTRElPX0RFVklDRV9JRF9JTlRF TF9JV01DMzIwMEdQUwkweDE0MDUKLSNkZWZpbmUgU0RJT19ERVZJQ0VfSURfSU5URUxfSVdNQzMy MDBCVAkJMHgxNDA2Ci0jZGVmaW5lIFNESU9fREVWSUNFX0lEX0lOVEVMX0lXTUMzMjAwV0lNQVhf Mkc1CTB4MTQwNworI2RlZmluZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV80MzE0MwkJMHhhODg3 CisjZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzMzQwCQkweGE5NGMKKyNkZWZpbmUg U0RJT19ERVZJQ0VfSURfQlJPQURDT01fNDMzNDEJCTB4YTk0ZAorI2RlZmluZSBTRElPX0RFVklD RV9JRF9CUk9BRENPTV80MzM2MgkJMHhhOTYyCisjZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FE Q09NXzQzMzY0CQkweGE5YTQKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJPQURDT01fNDM0MzAJ CTB4YTlhNgorI2RlZmluZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV80MzQ1NQkJMHhhOWJmCiAK ICNkZWZpbmUgU0RJT19WRU5ET1JfSURfTUFSVkVMTAkJCTB4MDJkZgogI2RlZmluZSBTRElPX0RF VklDRV9JRF9NQVJWRUxMX0xJQkVSVEFTCQkweDkxMDMKQEAgLTExMiwxMiArMTE4LDcgQEAKICNk ZWZpbmUgU0RJT19ERVZJQ0VfSURfU0lBTk9fTk9WQV9BMAkJMHgxMTAwCiAjZGVmaW5lIFNESU9f REVWSUNFX0lEX1NJQU5PX1NURUxMQVIgCQkweDUzNDcKIAotI2RlZmluZSBTRElPX1ZFTkRPUl9J RF9USQkJCTB4MDA5NwotI2RlZmluZSBTRElPX0RFVklDRV9JRF9USV9XTDEyNzEJCTB4NDA3Ngog I2RlZmluZSBTRElPX1ZFTkRPUl9JRF9USV9XTDEyNTEJCTB4MTA0YwogI2RlZmluZSBTRElPX0RF VklDRV9JRF9USV9XTDEyNTEJCTB4OTA2NgogCi0jZGVmaW5lIFNESU9fVkVORE9SX0lEX1NURQkJ CTB4MDAyMAotI2RlZmluZSBTRElPX0RFVklDRV9JRF9TVEVfQ1cxMjAwCQkweDIyODAKLQogI2Vu ZGlmIC8qIExJTlVYX01NQ19TRElPX0lEU19IICovCi0tIAoyLjIwLjEKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphdGgxMGsgbWFpbGluZyBsaXN0CmF0 aDEwa0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxt YW4vbGlzdGluZm8vYXRoMTBrCg== 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 B913BC433E0 for ; Fri, 22 May 2020 14:46:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 993882053B for ; Fri, 22 May 2020 14:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158782; bh=xL0iNQA61zcd+Iy+CRhN4KujKqVvoopu6rrafJslSYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JuYilk2PDwpym8yQ93zHMo727PGC9JJ0ueb19nTCCJsWTKt9OYVZ5IG9PlZLjYejj BFhJNq4ZJcZ7gn7Tv1gS2JlLITW2bXc++3kgDy5IAVMgNtjnoFjW6Y7kOkorvcJb8r Bq5m+zonkbiklQLD+Y0K6rXGo8dcoyB59c4LoHyY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730480AbgEVOqR (ORCPT ); Fri, 22 May 2020 10:46:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:48762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730357AbgEVOqK (ORCPT ); Fri, 22 May 2020 10:46:10 -0400 Received: from pali.im (pali.im [31.31.79.79]) (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 10128204EF; Fri, 22 May 2020 14:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158770; bh=xL0iNQA61zcd+Iy+CRhN4KujKqVvoopu6rrafJslSYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=07CBE6yL8mB6BaiAGeIP8E7u9ppDj+LFMIN/lwK1oOqis9HVXDBWiw0o7lfNXmqHr Mx2GhHNv2HSkmgoMWqwlC1uQjSC3ZDKZYHc3LoXCGV1sI14emQwsPiwa1cwjAM/rGf j5NOZPFFqtZBYD1I2MUSa3Of1aRp/BZXdQ9CdSzE= Received: by pali.im (Postfix) id 3863B51E; Fri, 22 May 2020 16:46:08 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: Matthias Brugger , Mauro Carvalho Chehab , Kalle Valo , Amitkumar Karwar , Ganapathi Bhat , Xinming Hu , linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, b43-dev@lists.infradead.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 11/11] mmc: sdio: Sort all SDIO IDs in common include file Date: Fri, 22 May 2020 16:44:12 +0200 Message-Id: <20200522144412.19712-12-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522144412.19712-1-pali@kernel.org> References: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Fix ordering of SDIO IDs to conform to the comment above, which says vendor first, device next. Signed-off-by: Pali Rohár --- include/linux/mmc/sdio_ids.h | 43 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index b19200aea56a..15ed8ce9d394 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -25,9 +25,23 @@ * Vendors and devices. Sort key: vendor first, device next. */ +#define SDIO_VENDOR_ID_STE 0x0020 +#define SDIO_DEVICE_ID_STE_CW1200 0x2280 + +#define SDIO_VENDOR_ID_INTEL 0x0089 +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403 +#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404 +#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS 0x1405 +#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406 +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5 0x1407 + #define SDIO_VENDOR_ID_CGUYS 0x0092 #define SDIO_DEVICE_ID_CGUYS_EW_CG1102GC 0x0004 +#define SDIO_VENDOR_ID_TI 0x0097 +#define SDIO_DEVICE_ID_TI_WL1271 0x4076 + #define SDIO_VENDOR_ID_ATHEROS 0x0271 #define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x0300 #define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x0301 @@ -41,34 +55,26 @@ #define SDIO_VENDOR_ID_BROADCOM 0x02d0 #define SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII 0x044b -#define SDIO_DEVICE_ID_BROADCOM_43143 0xa887 #define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 #define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 #define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 #define SDIO_DEVICE_ID_BROADCOM_4334 0x4334 -#define SDIO_DEVICE_ID_BROADCOM_43340 0xa94c -#define SDIO_DEVICE_ID_BROADCOM_43341 0xa94d #define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335 #define SDIO_DEVICE_ID_BROADCOM_4339 0x4339 -#define SDIO_DEVICE_ID_BROADCOM_43362 0xa962 -#define SDIO_DEVICE_ID_BROADCOM_43364 0xa9a4 -#define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345 -#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 +#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359 0x4355 #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356 #define SDIO_DEVICE_ID_BROADCOM_4359 0x4359 #define SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373 0x4373 #define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012 0xa804 -#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359 0x4355 - -#define SDIO_VENDOR_ID_INTEL 0x0089 -#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402 -#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403 -#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404 -#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS 0x1405 -#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406 -#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5 0x1407 +#define SDIO_DEVICE_ID_BROADCOM_43143 0xa887 +#define SDIO_DEVICE_ID_BROADCOM_43340 0xa94c +#define SDIO_DEVICE_ID_BROADCOM_43341 0xa94d +#define SDIO_DEVICE_ID_BROADCOM_43362 0xa962 +#define SDIO_DEVICE_ID_BROADCOM_43364 0xa9a4 +#define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 +#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf #define SDIO_VENDOR_ID_MARVELL 0x02df #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 @@ -112,12 +118,7 @@ #define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100 #define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347 -#define SDIO_VENDOR_ID_TI 0x0097 -#define SDIO_DEVICE_ID_TI_WL1271 0x4076 #define SDIO_VENDOR_ID_TI_WL1251 0x104c #define SDIO_DEVICE_ID_TI_WL1251 0x9066 -#define SDIO_VENDOR_ID_STE 0x0020 -#define SDIO_DEVICE_ID_STE_CW1200 0x2280 - #endif /* LINUX_MMC_SDIO_IDS_H */ -- 2.20.1