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

Add _WLAN suffix to macro names for consistency with other Marvell macros.
These IDs represents wlan function of combo bt/wlan cards. Other functions
of these cards have different IDs.

Signed-off-by: Pali Rohár <pali@kernel.org>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200522144412.19712-4-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com>

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 6a2dcb01caf40f9df496bd728a93f83a922f65af..a042965962a2d405a13358f6310d559e14dedc3d 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -480,45 +480,25 @@ static void mwifiex_sdio_coredump(struct device *dev)
                schedule_work(&card->work);
 }
 
-/* Device ID for SD8786 */
-#define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
-/* Device ID for SD8787 */
-#define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
-/* Device ID for SD8797 */
-#define SDIO_DEVICE_ID_MARVELL_8797   (0x9129)
-/* Device ID for SD8897 */
-#define SDIO_DEVICE_ID_MARVELL_8897   (0x912d)
-/* Device ID for SD8887 */
-#define SDIO_DEVICE_ID_MARVELL_8887   (0x9135)
-/* Device ID for SD8801 */
-#define SDIO_DEVICE_ID_MARVELL_8801   (0x9139)
-/* Device ID for SD8977 */
-#define SDIO_DEVICE_ID_MARVELL_8977   (0x9145)
-/* Device ID for SD8987 */
-#define SDIO_DEVICE_ID_MARVELL_8987   (0x9149)
-/* Device ID for SD8997 */
-#define SDIO_DEVICE_ID_MARVELL_8997   (0x9141)
-
-
 /* WLAN IDs */
 static const struct sdio_device_id mwifiex_ids[] = {
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8786_WLAN),
                .driver_data = (unsigned long) &mwifiex_sdio_sd8786},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_WLAN),
                .driver_data = (unsigned long) &mwifiex_sdio_sd8787},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_WLAN),
                .driver_data = (unsigned long) &mwifiex_sdio_sd8797},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_WLAN),
                .driver_data = (unsigned long) &mwifiex_sdio_sd8897},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_WLAN),
                .driver_data = (unsigned long)&mwifiex_sdio_sd8887},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8801_WLAN),
                .driver_data = (unsigned long)&mwifiex_sdio_sd8801},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_WLAN),
                .driver_data = (unsigned long)&mwifiex_sdio_sd8977},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_WLAN),
                .driver_data = (unsigned long)&mwifiex_sdio_sd8987},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_WLAN),
                .driver_data = (unsigned long)&mwifiex_sdio_sd8997},
        {},
 };

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 7e992a0e6cc086c5d6bab2d815261f14ee5cc8e1..90361ea7f5ed59f5ceef7f44a307ec4bb447718f 100644 (file)
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -58,8 +58,18 @@
 #define SDIO_DEVICE_ID_MARVELL_LIBERTAS                0x9103
 #define SDIO_DEVICE_ID_MARVELL_8688_WLAN       0x9104
 #define SDIO_DEVICE_ID_MARVELL_8688_BT         0x9105
+#define SDIO_DEVICE_ID_MARVELL_8786_WLAN       0x9116
+#define SDIO_DEVICE_ID_MARVELL_8787_WLAN       0x9119
 #define SDIO_DEVICE_ID_MARVELL_8797_F0         0x9128
+#define SDIO_DEVICE_ID_MARVELL_8797_WLAN       0x9129
+#define SDIO_DEVICE_ID_MARVELL_8897_WLAN       0x912d
 #define SDIO_DEVICE_ID_MARVELL_8887_F0         0x9134
+#define SDIO_DEVICE_ID_MARVELL_8887_WLAN       0x9135
+#define SDIO_DEVICE_ID_MARVELL_8801_WLAN       0x9139
+#define SDIO_DEVICE_ID_MARVELL_8997_F0         0x9140
+#define SDIO_DEVICE_ID_MARVELL_8997_WLAN       0x9141
+#define SDIO_DEVICE_ID_MARVELL_8977_WLAN       0x9145
+#define SDIO_DEVICE_ID_MARVELL_8987_WLAN       0x9149
 
 #define SDIO_VENDOR_ID_MEDIATEK                        0x037a