Commit 884f3860 authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson
Browse files

mmc: core: move some sdio IDs out of quirks file 



Consolidate all the sdio devices' IDs into sdio_ids.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 28fc64af

drivers/mmc/core/quirks.h

+0 −20
Original line number Diff line number Diff line
@@ -13,26 +13,6 @@ 


#include "card.h"



#ifndef SDIO_VENDOR_ID_TI

#define SDIO_VENDOR_ID_TI		0x0097

#endif



#ifndef SDIO_DEVICE_ID_TI_WL1271

#define SDIO_DEVICE_ID_TI_WL1271	0x4076

#endif



#ifndef SDIO_VENDOR_ID_STE

#define SDIO_VENDOR_ID_STE		0x0020

#endif



#ifndef SDIO_DEVICE_ID_STE_CW1200

#define SDIO_DEVICE_ID_STE_CW1200	0x2280

#endif



#ifndef SDIO_DEVICE_ID_MARVELL_8797_F0

#define SDIO_DEVICE_ID_MARVELL_8797_F0	0x9128

#endif



static const struct mmc_fixup mmc_fixup_methods[] = {

	SDIO_FIXUP(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271,

		   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),

include/linux/mmc/sdio_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#define SDIO_DEVICE_ID_MARVELL_LIBERTAS		0x9103

#define SDIO_DEVICE_ID_MARVELL_8688WLAN		0x9104

#define SDIO_DEVICE_ID_MARVELL_8688BT		0x9105

#define SDIO_DEVICE_ID_MARVELL_8797_F0		0x9128



#define SDIO_VENDOR_ID_SIANO			0x039a

#define SDIO_DEVICE_ID_SIANO_NOVA_B0		0x0201
@@ -60,4 +61,10 @@ 
#define SDIO_DEVICE_ID_SIANO_NOVA_A0		0x1100

#define SDIO_DEVICE_ID_SIANO_STELLAR 		0x5347



#define SDIO_VENDOR_ID_TI			0x0097

#define SDIO_DEVICE_ID_TI_WL1271		0x4076



#define SDIO_VENDOR_ID_STE			0x0020

#define SDIO_DEVICE_ID_STE_CW1200		0x2280



#endif /* LINUX_MMC_SDIO_IDS_H */