Skip to content

Commit b8c26a9

Browse files
palistorulf
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent baaa110 commit b8c26a9

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

drivers/media/mmc/siano/smssdio.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ static const struct sdio_device_id smssdio_ids[] = {
5858
.driver_data = SMS1XXX_BOARD_SIANO_VEGA},
5959
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_VENICE),
6060
.driver_data = SMS1XXX_BOARD_SIANO_VEGA},
61-
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x302),
61+
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_MING),
6262
.driver_data = SMS1XXX_BOARD_SIANO_MING},
63-
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x500),
63+
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_PELE),
6464
.driver_data = SMS1XXX_BOARD_SIANO_PELE},
65-
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x600),
65+
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_RIO),
6666
.driver_data = SMS1XXX_BOARD_SIANO_RIO},
67-
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x700),
67+
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_DENVER_2160),
6868
.driver_data = SMS1XXX_BOARD_SIANO_DENVER_2160},
69-
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, 0x800),
69+
{SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_DENVER_1530),
7070
.driver_data = SMS1XXX_BOARD_SIANO_DENVER_1530},
7171
{ /* end: all zeroes */ },
7272
};

include/linux/mmc/sdio_ids.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
#define SDIO_DEVICE_ID_SIANO_NICE 0x0202
8989
#define SDIO_DEVICE_ID_SIANO_VEGA_A0 0x0300
9090
#define SDIO_DEVICE_ID_SIANO_VENICE 0x0301
91+
#define SDIO_DEVICE_ID_SIANO_MING 0x0302
92+
#define SDIO_DEVICE_ID_SIANO_PELE 0x0500
93+
#define SDIO_DEVICE_ID_SIANO_RIO 0x0600
94+
#define SDIO_DEVICE_ID_SIANO_DENVER_2160 0x0700
95+
#define SDIO_DEVICE_ID_SIANO_DENVER_1530 0x0800
9196
#define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100
9297
#define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347
9398

0 commit comments

Comments
 (0)