Skip to content

Commit 798dd3c

Browse files
palistorulf
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent 1eb9112 commit 798dd3c

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

include/linux/mmc/sdio_ids.h

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,23 @@
2525
* Vendors and devices. Sort key: vendor first, device next.
2626
*/
2727

28+
#define SDIO_VENDOR_ID_STE 0x0020
29+
#define SDIO_DEVICE_ID_STE_CW1200 0x2280
30+
31+
#define SDIO_VENDOR_ID_INTEL 0x0089
32+
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
33+
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403
34+
#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
35+
#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS 0x1405
36+
#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406
37+
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5 0x1407
38+
2839
#define SDIO_VENDOR_ID_CGUYS 0x0092
2940
#define SDIO_DEVICE_ID_CGUYS_EW_CG1102GC 0x0004
3041

42+
#define SDIO_VENDOR_ID_TI 0x0097
43+
#define SDIO_DEVICE_ID_TI_WL1271 0x4076
44+
3145
#define SDIO_VENDOR_ID_ATHEROS 0x0271
3246
#define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x0300
3347
#define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x0301
@@ -41,34 +55,26 @@
4155

4256
#define SDIO_VENDOR_ID_BROADCOM 0x02d0
4357
#define SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII 0x044b
44-
#define SDIO_DEVICE_ID_BROADCOM_43143 0xa887
4558
#define SDIO_DEVICE_ID_BROADCOM_43241 0x4324
4659
#define SDIO_DEVICE_ID_BROADCOM_4329 0x4329
4760
#define SDIO_DEVICE_ID_BROADCOM_4330 0x4330
4861
#define SDIO_DEVICE_ID_BROADCOM_4334 0x4334
49-
#define SDIO_DEVICE_ID_BROADCOM_43340 0xa94c
50-
#define SDIO_DEVICE_ID_BROADCOM_43341 0xa94d
5162
#define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335
5263
#define SDIO_DEVICE_ID_BROADCOM_4339 0x4339
53-
#define SDIO_DEVICE_ID_BROADCOM_43362 0xa962
54-
#define SDIO_DEVICE_ID_BROADCOM_43364 0xa9a4
55-
#define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6
5664
#define SDIO_DEVICE_ID_BROADCOM_4345 0x4345
57-
#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf
5865
#define SDIO_DEVICE_ID_BROADCOM_4354 0x4354
66+
#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359 0x4355
5967
#define SDIO_DEVICE_ID_BROADCOM_4356 0x4356
6068
#define SDIO_DEVICE_ID_BROADCOM_4359 0x4359
6169
#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373 0x4373
6270
#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012 0xa804
63-
#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359 0x4355
64-
65-
#define SDIO_VENDOR_ID_INTEL 0x0089
66-
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
67-
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403
68-
#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
69-
#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS 0x1405
70-
#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406
71-
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5 0x1407
71+
#define SDIO_DEVICE_ID_BROADCOM_43143 0xa887
72+
#define SDIO_DEVICE_ID_BROADCOM_43340 0xa94c
73+
#define SDIO_DEVICE_ID_BROADCOM_43341 0xa94d
74+
#define SDIO_DEVICE_ID_BROADCOM_43362 0xa962
75+
#define SDIO_DEVICE_ID_BROADCOM_43364 0xa9a4
76+
#define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6
77+
#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf
7278

7379
#define SDIO_VENDOR_ID_MARVELL 0x02df
7480
#define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103
@@ -112,12 +118,7 @@
112118
#define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100
113119
#define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347
114120

115-
#define SDIO_VENDOR_ID_TI 0x0097
116-
#define SDIO_DEVICE_ID_TI_WL1271 0x4076
117121
#define SDIO_VENDOR_ID_TI_WL1251 0x104c
118122
#define SDIO_DEVICE_ID_TI_WL1251 0x9066
119123

120-
#define SDIO_VENDOR_ID_STE 0x0020
121-
#define SDIO_DEVICE_ID_STE_CW1200 0x2280
122-
123124
#endif /* LINUX_MMC_SDIO_IDS_H */

0 commit comments

Comments
 (0)