diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2014-09-30 06:45:32 -0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-09-30 14:13:29 +0200 |
| commit | 1e3e492c3d7e78dad29ec0d6f36e18a785ea2720 (patch) | |
| tree | 794234d614b3d5e732baf6e0ee00b2bfcb45066a /drivers/bluetooth | |
| parent | 156395c9989a76228e0da40e71267a3d4fb07419 (diff) | |
| download | linux-stable-1e3e492c3d7e78dad29ec0d6f36e18a785ea2720.tar.gz linux-stable-1e3e492c3d7e78dad29ec0d6f36e18a785ea2720.tar.bz2 linux-stable-1e3e492c3d7e78dad29ec0d6f36e18a785ea2720.zip | |
Bluetooth: btmrvl: rename definitions from 88xx to 8897
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>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 3e683b153259..b549fb538684 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -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, }; |