Moved macros used for Vendor/Device ID from wilc1000 driver to common header file and changed macro name for consistency with other macros.
Unified · Split
| @@ -6,6 +6,7 @@ · 5 unmodified lines | ||
| 6 | 6 | |
| 7 | 7 | #include <linux/clk.h> |
| 8 | 8 | #include <linux/mmc/sdio_func.h> |
| 9 | +#include <linux/mmc/sdio_ids.h> | |
| 9 | 10 | #include <linux/mmc/host.h> |
| 10 | 11 | #include <linux/mmc/sdio.h> |
| 11 | 12 | #include <linux/of_irq.h> |
| @@ -15,11 +16,8 @@ · 3 unmodified lines | ||
| 15 | 16 | |
| 16 | 17 | #define SDIO_MODALIAS "wilc1000_sdio" |
| 17 | 18 | |
| 18 | −#define SDIO_VENDOR_ID_WILC 0x0296 | |
| 19 | −#define SDIO_DEVICE_ID_WILC 0x5347 | |
| 20 | − | |
| 21 | 19 | static const struct sdio_device_id wilc_sdio_ids[] = { |
| 22 | − { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) }, | |
| 20 | + { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) }, | |
| 23 | 21 | { }, |
| 24 | 22 | }; |
| 25 | 23 | |
| @@ -105,6 +105,9 @@ · 104 unmodified lines | ||
| 105 | 105 | #define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663 |
| 106 | 106 | #define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668 |
| 107 | 107 | |
| 108 | +#define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296 | |
| 109 | +#define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347 | |
| 110 | + | |
| 108 | 111 | #define SDIO_VENDOR_ID_SIANO 0x039a |
| 109 | 112 | #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 |
| 110 | 113 | #define SDIO_DEVICE_ID_SIANO_NICE 0x0202 |