Bluetooth: btmrvl: rename definitions from 88xx to 8897
authorAmitkumar Karwar <akarwar@marvell.com>
Tue, 30 Sep 2014 10:45:32 +0000 (06:45 -0400)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 30 Sep 2014 12:13:29 +0000 (14:13 +0200)
Register offsets are different for SD8897 and newer chip SD8887.
We can not have common btmrvl_sdio_card_reg map for them.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/btmrvl_sdio.c

index 3e683b1532598231dc156bbc69887dd2e836d4da..b549fb5386849e3bab42ec7c80b5cabd79e8ab65 100644 (file)
@@ -84,7 +84,7 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
        .int_read_to_clear = false,
 };
 
-static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {
+static const struct btmrvl_sdio_card_reg btmrvl_reg_8897 = {
        .cfg = 0x00,
        .host_int_mask = 0x02,
        .host_intstatus = 0x03,
@@ -131,7 +131,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {
        .helper         = NULL,
        .firmware       = "mrvl/sd8897_uapsta.bin",
-       .reg            = &btmrvl_reg_88xx,
+       .reg            = &btmrvl_reg_8897,
        .support_pscan_win_report = true,
        .sd_blksz_fw_dl = 256,
 };