History

mmc: sdio: Move SDIO IDs from btmrvl driver to common include file

Define appropriate macro names for consistency with other Marvell macros.

Pali Rohár committed 6 years ago

Commit 649c7d71 parent 7d14c682 files · +17 −9Browse files

Unified · Split

2 files
  1. drivers/bluetooth/btmrvl_sdio.c +9 −9
  2. include/linux/mmc/sdio_ids.h +8 −0
drivers/bluetooth/btmrvl_sdio.c+9−9
@@ -355,31 +355,31 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = { · 354 unmodified lines
355 355
356static const struct sdio_device_id btmrvl_sdio_ids[] = {356static const struct sdio_device_id btmrvl_sdio_ids[] = {
357 /* Marvell SD8688 Bluetooth device */357 /* Marvell SD8688 Bluetooth device */
358 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),358 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8688_BT),
359 .driver_data = (unsigned long)&btmrvl_sdio_sd8688 },359 .driver_data = (unsigned long)&btmrvl_sdio_sd8688 },
360 /* Marvell SD8787 Bluetooth device */360 /* Marvell SD8787 Bluetooth device */
361 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),361 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT),
362 .driver_data = (unsigned long)&btmrvl_sdio_sd8787 },362 .driver_data = (unsigned long)&btmrvl_sdio_sd8787 },
363 /* Marvell SD8787 Bluetooth AMP device */363 /* Marvell SD8787 Bluetooth AMP device */
364 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911B),364 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT_AMP),
365 .driver_data = (unsigned long)&btmrvl_sdio_sd8787 },365 .driver_data = (unsigned long)&btmrvl_sdio_sd8787 },
366 /* Marvell SD8797 Bluetooth device */366 /* Marvell SD8797 Bluetooth device */
367 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),367 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_BT),
368 .driver_data = (unsigned long)&btmrvl_sdio_sd8797 },368 .driver_data = (unsigned long)&btmrvl_sdio_sd8797 },
369 /* Marvell SD8887 Bluetooth device */369 /* Marvell SD8887 Bluetooth device */
370 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9136),370 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_BT),
371 .driver_data = (unsigned long)&btmrvl_sdio_sd8887 },371 .driver_data = (unsigned long)&btmrvl_sdio_sd8887 },
372 /* Marvell SD8897 Bluetooth device */372 /* Marvell SD8897 Bluetooth device */
373 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),373 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_BT),
374 .driver_data = (unsigned long)&btmrvl_sdio_sd8897 },374 .driver_data = (unsigned long)&btmrvl_sdio_sd8897 },
375 /* Marvell SD8977 Bluetooth device */375 /* Marvell SD8977 Bluetooth device */
376 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9146),376 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_BT),
377 .driver_data = (unsigned long)&btmrvl_sdio_sd8977 },377 .driver_data = (unsigned long)&btmrvl_sdio_sd8977 },
378 /* Marvell SD8987 Bluetooth device */378 /* Marvell SD8987 Bluetooth device */
379 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x914A),379 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_BT),
380 .driver_data = (unsigned long)&btmrvl_sdio_sd8987 },380 .driver_data = (unsigned long)&btmrvl_sdio_sd8987 },
381 /* Marvell SD8997 Bluetooth device */381 /* Marvell SD8997 Bluetooth device */
382 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9142),382 { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_BT),
383 .driver_data = (unsigned long)&btmrvl_sdio_sd8997 },383 .driver_data = (unsigned long)&btmrvl_sdio_sd8997 },
384 384
385 { } /* Terminating entry */385 { } /* Terminating entry */
include/linux/mmc/sdio_ids.h+8−0
@@ -60,16 +60,24 @@ · 59 unmodified lines
60#define SDIO_DEVICE_ID_MARVELL_8688_BT 0x910560#define SDIO_DEVICE_ID_MARVELL_8688_BT 0x9105
61#define SDIO_DEVICE_ID_MARVELL_8786_WLAN 0x911661#define SDIO_DEVICE_ID_MARVELL_8786_WLAN 0x9116
62#define SDIO_DEVICE_ID_MARVELL_8787_WLAN 0x911962#define SDIO_DEVICE_ID_MARVELL_8787_WLAN 0x9119
63#define SDIO_DEVICE_ID_MARVELL_8787_BT 0x911a
64#define SDIO_DEVICE_ID_MARVELL_8787_BT_AMP 0x911b
63#define SDIO_DEVICE_ID_MARVELL_8797_F0 0x912865#define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128
64#define SDIO_DEVICE_ID_MARVELL_8797_WLAN 0x912966#define SDIO_DEVICE_ID_MARVELL_8797_WLAN 0x9129
67#define SDIO_DEVICE_ID_MARVELL_8797_BT 0x912a
65#define SDIO_DEVICE_ID_MARVELL_8897_WLAN 0x912d68#define SDIO_DEVICE_ID_MARVELL_8897_WLAN 0x912d
69#define SDIO_DEVICE_ID_MARVELL_8897_BT 0x912e
66#define SDIO_DEVICE_ID_MARVELL_8887_F0 0x913470#define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134
67#define SDIO_DEVICE_ID_MARVELL_8887_WLAN 0x913571#define SDIO_DEVICE_ID_MARVELL_8887_WLAN 0x9135
72#define SDIO_DEVICE_ID_MARVELL_8887_BT 0x9136
68#define SDIO_DEVICE_ID_MARVELL_8801_WLAN 0x913973#define SDIO_DEVICE_ID_MARVELL_8801_WLAN 0x9139
69#define SDIO_DEVICE_ID_MARVELL_8997_F0 0x914074#define SDIO_DEVICE_ID_MARVELL_8997_F0 0x9140
70#define SDIO_DEVICE_ID_MARVELL_8997_WLAN 0x914175#define SDIO_DEVICE_ID_MARVELL_8997_WLAN 0x9141
76#define SDIO_DEVICE_ID_MARVELL_8997_BT 0x9142
71#define SDIO_DEVICE_ID_MARVELL_8977_WLAN 0x914577#define SDIO_DEVICE_ID_MARVELL_8977_WLAN 0x9145
78#define SDIO_DEVICE_ID_MARVELL_8977_BT 0x9146
72#define SDIO_DEVICE_ID_MARVELL_8987_WLAN 0x914979#define SDIO_DEVICE_ID_MARVELL_8987_WLAN 0x9149
80#define SDIO_DEVICE_ID_MARVELL_8987_BT 0x914a
73 81
74#define SDIO_VENDOR_ID_MEDIATEK 0x037a82#define SDIO_VENDOR_ID_MEDIATEK 0x037a
75 83

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t