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

Define appropriate macro names for consistency with other Siano macros.

Signed-off-by: Pali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20200522144412.19712-7-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/media/mmc/siano/smssdio.c b/drivers/media/mmc/siano/smssdio.c
index def5e93..065b572 100644 (file)
--- a/drivers/media/mmc/siano/smssdio.c
+++ b/drivers/media/mmc/siano/smssdio.c
@@ -58,15 +58,15 @@ static const struct sdio_device_id smssdio_ids[] = {
         .driver_data = SMS1XXX_BOARD_SIANO_VEGA},
        {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_VENICE),
         .driver_data = SMS1XXX_BOARD_SIANO_VEGA},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x302),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_MING),
        .driver_data = SMS1XXX_BOARD_SIANO_MING},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x500),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_PELE),
        .driver_data = SMS1XXX_BOARD_SIANO_PELE},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x600),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_RIO),
        .driver_data = SMS1XXX_BOARD_SIANO_RIO},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x700),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_DENVER_2160),
        .driver_data = SMS1XXX_BOARD_SIANO_DENVER_2160},
-       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x800),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_DENVER_1530),
        .driver_data = SMS1XXX_BOARD_SIANO_DENVER_1530},
        { /* end: all zeroes */ },
 };

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index c9aca57..9ec675a 100644 (file)
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -88,6 +88,11 @@
 #define SDIO_DEVICE_ID_SIANO_NICE              0x0202
 #define SDIO_DEVICE_ID_SIANO_VEGA_A0           0x0300
 #define SDIO_DEVICE_ID_SIANO_VENICE            0x0301
+#define SDIO_DEVICE_ID_SIANO_MING              0x0302
+#define SDIO_DEVICE_ID_SIANO_PELE              0x0500
+#define SDIO_DEVICE_ID_SIANO_RIO               0x0600
+#define SDIO_DEVICE_ID_SIANO_DENVER_2160       0x0700
+#define SDIO_DEVICE_ID_SIANO_DENVER_1530       0x0800
 #define SDIO_DEVICE_ID_SIANO_NOVA_A0           0x1100
 #define SDIO_DEVICE_ID_SIANO_STELLAR           0x5347