Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22f2efed authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville
Browse files

Bluetooth: btmrvl: support Marvell Bluetooth device SD8897 



The register offsets have been changed in SD8897 and newer chips.
Define a new btmrvl_sdio_card_reg map for SD88xx.

Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarFrank Huang <frankh@marvell.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 757aee0f

drivers/bluetooth/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -201,7 +201,7 @@ config BT_MRVL 
	  The core driver to support Marvell Bluetooth devices.

	  The core driver to support Marvell Bluetooth devices.





	  This driver is required if you want to support

	  This driver is required if you want to support

	  Marvell Bluetooth devices, such as 8688/8787/8797.

	  Marvell Bluetooth devices, such as 8688/8787/8797/8897.





	  Say Y here to compile Marvell Bluetooth driver

	  Say Y here to compile Marvell Bluetooth driver

	  into the kernel or say M to compile it as module.

	  into the kernel or say M to compile it as module.
@@ -214,7 +214,7 @@ config BT_MRVL_SDIO 
	  The driver for Marvell Bluetooth chipsets with SDIO interface.

	  The driver for Marvell Bluetooth chipsets with SDIO interface.





	  This driver is required if you want to use Marvell Bluetooth

	  This driver is required if you want to use Marvell Bluetooth

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8897

	  chipsets are supported.

	  chipsets are supported.





	  Say Y here to compile support for Marvell BT-over-SDIO driver

	  Say Y here to compile support for Marvell BT-over-SDIO driver

drivers/bluetooth/btmrvl_sdio.c

+28 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,23 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = { 
	.io_port_2 = 0x7a,

	.io_port_2 = 0x7a,

};

};





static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {

	.cfg = 0x00,

	.host_int_mask = 0x02,

	.host_intstatus = 0x03,

	.card_status = 0x50,

	.sq_read_base_addr_a0 = 0x60,

	.sq_read_base_addr_a1 = 0x61,

	.card_revision = 0xbc,

	.card_fw_status0 = 0xc0,

	.card_fw_status1 = 0xc1,

	.card_rx_len = 0xc2,

	.card_rx_unit = 0xc3,

	.io_port_0 = 0xd8,

	.io_port_1 = 0xd9,

	.io_port_2 = 0xda,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {

static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {

	.helper		= "mrvl/sd8688_helper.bin",

	.helper		= "mrvl/sd8688_helper.bin",

	.firmware	= "mrvl/sd8688.bin",

	.firmware	= "mrvl/sd8688.bin",
@@ -103,6 +120,13 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = { 
	.sd_blksz_fw_dl	= 256,

	.sd_blksz_fw_dl	= 256,

};

};





static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {

	.helper		= NULL,

	.firmware	= "mrvl/sd8897_uapsta.bin",

	.reg		= &btmrvl_reg_88xx,

	.sd_blksz_fw_dl	= 256,

};



static const struct sdio_device_id btmrvl_sdio_ids[] = {

static const struct sdio_device_id btmrvl_sdio_ids[] = {

	/* Marvell SD8688 Bluetooth device */

	/* Marvell SD8688 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),
@@ -116,6 +140,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = { 
	/* Marvell SD8797 Bluetooth device */

	/* Marvell SD8797 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },

			.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },

	/* Marvell SD8897 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912E),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8897 },





	{ }	/* Terminating entry */

	{ }	/* Terminating entry */

};

};
@@ -1194,3 +1221,4 @@ MODULE_FIRMWARE("mrvl/sd8688_helper.bin"); 
MODULE_FIRMWARE("mrvl/sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");