mwifiex: pcie: correct scratch register name

This patch correct pcie scratch register name, to keep the same with
chipset side definition.

Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 92ffb1ba17e6165b7e6b055f88d60985a201b528..061223149bedd5dd6cbf9f122466a41bd0243298 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2494,8 +2494,8 @@ mwifiex_pcie_reg_dump(struct mwifiex_adapter *adapter, char *drv_buf)
        struct pcie_service_card *card = adapter->card;
        const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
        int pcie_scratch_reg[] = {PCIE_SCRATCH_12_REG,
-                                 PCIE_SCRATCH_13_REG,
-                                 PCIE_SCRATCH_14_REG};
+                                 PCIE_SCRATCH_14_REG,
+                                 PCIE_SCRATCH_15_REG};
 
        if (!p)
                return 0;

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
index 00e8ee5ad4a834ed1905c5b98acee85be3ca1a32..7e2450ce79d33fb652652a37e74808b1eb10e582 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -77,8 +77,9 @@
 #define PCIE_SCRATCH_10_REG                            0xCE8
 #define PCIE_SCRATCH_11_REG                            0xCEC
 #define PCIE_SCRATCH_12_REG                            0xCF0
-#define PCIE_SCRATCH_13_REG                            0xCF8
-#define PCIE_SCRATCH_14_REG                            0xCFC
+#define PCIE_SCRATCH_13_REG                            0xCF4
+#define PCIE_SCRATCH_14_REG                            0xCF8
+#define PCIE_SCRATCH_15_REG                            0xCFC
 #define PCIE_RD_DATA_PTR_Q0_Q1                          0xC08C
 #define PCIE_WR_DATA_PTR_Q0_Q1                          0xC05C
 
@@ -217,8 +218,8 @@ static const struct mwifiex_pcie_card_reg mwifiex_reg_8897 = {
        .ring_tx_start_ptr = MWIFIEX_BD_FLAG_TX_START_PTR,
        .pfu_enabled = 1,
        .sleep_cookie = 0,
-       .fw_dump_ctrl = 0xcf4,
-       .fw_dump_start = 0xcf8,
+       .fw_dump_ctrl = PCIE_SCRATCH_13_REG,
+       .fw_dump_start = PCIE_SCRATCH_14_REG,
        .fw_dump_end = 0xcff,
        .fw_dump_host_ready = 0xee,
        .fw_dump_read_done = 0xfe,
@@ -254,8 +255,8 @@ static const struct mwifiex_pcie_card_reg mwifiex_reg_8997 = {
        .ring_tx_start_ptr = MWIFIEX_BD_FLAG_TX_START_PTR,
        .pfu_enabled = 1,
        .sleep_cookie = 0,
-       .fw_dump_ctrl = 0xcf4,
-       .fw_dump_start = 0xcf8,
+       .fw_dump_ctrl = PCIE_SCRATCH_13_REG,
+       .fw_dump_start = PCIE_SCRATCH_14_REG,
        .fw_dump_end = 0xcff,
        .fw_dump_host_ready = 0xcc,
        .fw_dump_read_done = 0xdd,