Commit 649c7d76 authored by Pali Rohár's avatar Pali Rohár Committed by Ulf Hansson
Browse files

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



Define appropriate macro names for consistency with other Marvell macros.

Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20200522144412.19712-5-pali@kernel.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarGanapathi Bhat <ganapathi.bhat@nxp.com>
parent 7d14c687

drivers/bluetooth/btmrvl_sdio.c

+9 −9
Original line number Diff line number Diff line
@@ -355,31 +355,31 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = { 


static const struct sdio_device_id btmrvl_sdio_ids[] = {

	/* Marvell SD8688 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8688_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8688 },

	/* Marvell SD8787 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8787 },

	/* Marvell SD8787 Bluetooth AMP device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911B),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787_BT_AMP),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8787 },

	/* Marvell SD8797 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8797_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8797 },

	/* Marvell SD8887 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9136),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8887_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8887 },

	/* Marvell SD8897 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8897_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8897 },

	/* Marvell SD8977 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9146),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8977 },

	/* Marvell SD8987 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x914A),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8987 },

	/* Marvell SD8997 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9142),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_BT),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8997 },



	{ }	/* Terminating entry */

include/linux/mmc/sdio_ids.h

+8 −0
Original line number Diff line number Diff line
@@ -60,16 +60,24 @@ 
#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_8787_BT		0x911a

#define SDIO_DEVICE_ID_MARVELL_8787_BT_AMP	0x911b

#define SDIO_DEVICE_ID_MARVELL_8797_F0		0x9128

#define SDIO_DEVICE_ID_MARVELL_8797_WLAN	0x9129

#define SDIO_DEVICE_ID_MARVELL_8797_BT		0x912a

#define SDIO_DEVICE_ID_MARVELL_8897_WLAN	0x912d

#define SDIO_DEVICE_ID_MARVELL_8897_BT		0x912e

#define SDIO_DEVICE_ID_MARVELL_8887_F0		0x9134

#define SDIO_DEVICE_ID_MARVELL_8887_WLAN	0x9135

#define SDIO_DEVICE_ID_MARVELL_8887_BT		0x9136

#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_8997_BT		0x9142

#define SDIO_DEVICE_ID_MARVELL_8977_WLAN	0x9145

#define SDIO_DEVICE_ID_MARVELL_8977_BT		0x9146

#define SDIO_DEVICE_ID_MARVELL_8987_WLAN	0x9149

#define SDIO_DEVICE_ID_MARVELL_8987_BT		0x914a



#define SDIO_VENDOR_ID_MEDIATEK			0x037a