mmc: sdio: Sort all SDIO IDs in common include file

Fix ordering of SDIO IDs to conform to the comment above, which says vendor
first, device next.

Signed-off-by: Pali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20200522144412.19712-12-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index b19200aea56ace2f87869cd068fff128b4d883e4..15ed8ce9d3943f9a0e9aed04f0d1214f63103ce5 100644 (file)
--- 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 */