Skip to content

Commit 4bc90f4

Browse files
palistorulf
authored andcommitted
mmc: sdio: Fix macro name for Marvell device with ID 0x9134
Marvell SDIO device ID 0x9134 is used in SDIO Common CIS (Card Information Structure) and not in SDIO wlan function (with ID 1). SDIO Common CIS is accessed by function ID 0. So change this misleading macro name to SDIO_DEVICE_ID_MARVELL_8887_F0 as it does not refer to wlan function. It refers to function 0. Wlan module on this SDIO card is available at function ID 1 and is identified by different SDIO device ID 0x9135. Kernel quirks for SDIO devices are matched against device ID from SDIO Common CIS. Therefore device ID used in quirk is correct, just has misleading name. 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 b303c16 commit 4bc90f4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/mmc/core/quirks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static const struct mmc_fixup sdio_fixup_methods[] = {
139139
SDIO_FIXUP(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_F0,
140140
add_quirk, MMC_QUIRK_BROKEN_IRQ_POLLING),
141141

142-
SDIO_FIXUP(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887WLAN,
142+
SDIO_FIXUP(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_F0,
143143
add_limit_rate_quirk, 150000000),
144144

145145
END_FIXUP

include/linux/mmc/sdio_ids.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104
6060
#define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105
6161
#define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128
62-
#define SDIO_DEVICE_ID_MARVELL_8887WLAN 0x9134
62+
#define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134
6363

6464
#define SDIO_VENDOR_ID_MEDIATEK 0x037a
6565

0 commit comments

Comments
 (0)