Bluetooth: btmrvl: eliminate duplicates introducing btmrvl_reg_89xx

SD89xx devices use identical card register settings. Make sure a single common
instance is used to describe them.

Signed-off-by: Tamás Szűcs <tszucs@protonmail.ch>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index d15fd5be0216b47099e02f2c256d076073bf6cce..33d58b30c5acfc23ab4cf7c0d63e6980e8f017fe 100644 (file)
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -215,30 +215,7 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8897 = {
        .fw_dump_end = 0xea,
 };
 
-static const struct btmrvl_sdio_card_reg btmrvl_reg_8977 = {
-       .cfg = 0x00,
-       .host_int_mask = 0x08,
-       .host_intstatus = 0x0c,
-       .card_status = 0x5c,
-       .sq_read_base_addr_a0 = 0xf8,
-       .sq_read_base_addr_a1 = 0xf9,
-       .card_revision = 0xc8,
-       .card_fw_status0 = 0xe8,
-       .card_fw_status1 = 0xe9,
-       .card_rx_len = 0xea,
-       .card_rx_unit = 0xeb,
-       .io_port_0 = 0xe4,
-       .io_port_1 = 0xe5,
-       .io_port_2 = 0xe6,
-       .int_read_to_clear = true,
-       .host_int_rsr = 0x04,
-       .card_misc_cfg = 0xD8,
-       .fw_dump_ctrl = 0xf0,
-       .fw_dump_start = 0xf1,
-       .fw_dump_end = 0xf8,
-};
-
-static const struct btmrvl_sdio_card_reg btmrvl_reg_8987 = {
+static const struct btmrvl_sdio_card_reg btmrvl_reg_89xx = {
        .cfg = 0x00,
        .host_int_mask = 0x08,
        .host_intstatus = 0x0c,
@@ -261,29 +238,6 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8987 = {
        .fw_dump_end = 0xf8,
 };
 
-static const struct btmrvl_sdio_card_reg btmrvl_reg_8997 = {
-       .cfg = 0x00,
-       .host_int_mask = 0x08,
-       .host_intstatus = 0x0c,
-       .card_status = 0x5c,
-       .sq_read_base_addr_a0 = 0xf8,
-       .sq_read_base_addr_a1 = 0xf9,
-       .card_revision = 0xc8,
-       .card_fw_status0 = 0xe8,
-       .card_fw_status1 = 0xe9,
-       .card_rx_len = 0xea,
-       .card_rx_unit = 0xeb,
-       .io_port_0 = 0xe4,
-       .io_port_1 = 0xe5,
-       .io_port_2 = 0xe6,
-       .int_read_to_clear = true,
-       .host_int_rsr = 0x04,
-       .card_misc_cfg = 0xD8,
-       .fw_dump_ctrl = 0xf0,
-       .fw_dump_start = 0xf1,
-       .fw_dump_end = 0xf8,
-};
-
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
        .helper         = "mrvl/sd8688_helper.bin",
        .firmware       = "mrvl/sd8688.bin",
@@ -332,7 +286,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = {
        .helper         = NULL,
        .firmware       = "mrvl/sdsd8977_combo_v2.bin",
-       .reg            = &btmrvl_reg_8977,
+       .reg            = &btmrvl_reg_89xx,
        .support_pscan_win_report = true,
        .sd_blksz_fw_dl = 256,
        .supports_fw_dump = true,
@@ -341,7 +295,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = {
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = {
        .helper         = NULL,
        .firmware       = "mrvl/sd8987_uapsta.bin",
-       .reg            = &btmrvl_reg_8987,
+       .reg            = &btmrvl_reg_89xx,
        .support_pscan_win_report = true,
        .sd_blksz_fw_dl = 256,
        .supports_fw_dump = true,
@@ -350,7 +304,7 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = {
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = {
        .helper         = NULL,
        .firmware       = "mrvl/sdsd8997_combo_v4.bin",
-       .reg            = &btmrvl_reg_8997,
+       .reg            = &btmrvl_reg_89xx,
        .support_pscan_win_report = true,
        .sd_blksz_fw_dl = 256,
        .supports_fw_dump = true,