Define appropriate macro names for consistency with other Marvell macros.
Unified · Split
| @@ -355,31 +355,31 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = { · 354 unmodified lines | ||
| 355 | 355 | |
| 356 | 356 | static const struct sdio_device_id btmrvl_sdio_ids[] = { |
| 357 | 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 | 359 | .driver_data = (unsigned long)&btmrvl_sdio_sd8688 }, |
| 360 | 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 | 362 | .driver_data = (unsigned long)&btmrvl_sdio_sd8787 }, |
| 363 | 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 | 365 | .driver_data = (unsigned long)&btmrvl_sdio_sd8787 }, |
| 366 | 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 | 368 | .driver_data = (unsigned long)&btmrvl_sdio_sd8797 }, |
| 369 | 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 | 371 | .driver_data = (unsigned long)&btmrvl_sdio_sd8887 }, |
| 372 | 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 | 374 | .driver_data = (unsigned long)&btmrvl_sdio_sd8897 }, |
| 375 | 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 | 377 | .driver_data = (unsigned long)&btmrvl_sdio_sd8977 }, |
| 378 | 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 | 380 | .driver_data = (unsigned long)&btmrvl_sdio_sd8987 }, |
| 381 | 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 | 383 | .driver_data = (unsigned long)&btmrvl_sdio_sd8997 }, |
| 384 | 384 | |
| 385 | 385 | { } /* Terminating entry */ |
| @@ -60,16 +60,24 @@ · 59 unmodified lines | ||
| 60 | 60 | #define SDIO_DEVICE_ID_MARVELL_8688_BT 0x9105 |
| 61 | 61 | #define SDIO_DEVICE_ID_MARVELL_8786_WLAN 0x9116 |
| 62 | 62 | #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 | 65 | #define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128 |
| 64 | 66 | #define SDIO_DEVICE_ID_MARVELL_8797_WLAN 0x9129 |
| 67 | +#define SDIO_DEVICE_ID_MARVELL_8797_BT 0x912a | |
| 65 | 68 | #define SDIO_DEVICE_ID_MARVELL_8897_WLAN 0x912d |
| 69 | +#define SDIO_DEVICE_ID_MARVELL_8897_BT 0x912e | |
| 66 | 70 | #define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134 |
| 67 | 71 | #define SDIO_DEVICE_ID_MARVELL_8887_WLAN 0x9135 |
| 72 | +#define SDIO_DEVICE_ID_MARVELL_8887_BT 0x9136 | |
| 68 | 73 | #define SDIO_DEVICE_ID_MARVELL_8801_WLAN 0x9139 |
| 69 | 74 | #define SDIO_DEVICE_ID_MARVELL_8997_F0 0x9140 |
| 70 | 75 | #define SDIO_DEVICE_ID_MARVELL_8997_WLAN 0x9141 |
| 76 | +#define SDIO_DEVICE_ID_MARVELL_8997_BT 0x9142 | |
| 71 | 77 | #define SDIO_DEVICE_ID_MARVELL_8977_WLAN 0x9145 |
| 78 | +#define SDIO_DEVICE_ID_MARVELL_8977_BT 0x9146 | |
| 72 | 79 | #define SDIO_DEVICE_ID_MARVELL_8987_WLAN 0x9149 |
| 80 | +#define SDIO_DEVICE_ID_MARVELL_8987_BT 0x914a | |
| 73 | 81 | |
| 74 | 82 | #define SDIO_VENDOR_ID_MEDIATEK 0x037a |
| 75 | 83 | |