diff options
| -rw-r--r-- | drivers/net/wireless/wcnss/wcnss_wlan.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c index 686870df2aef..17f310b41fc9 100644 --- a/drivers/net/wireless/wcnss/wcnss_wlan.c +++ b/drivers/net/wireless/wcnss/wcnss_wlan.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -155,11 +155,6 @@ static DEFINE_SPINLOCK(reg_spinlock); #define PRONTO_SAW2_SPM_CTL 0x30 #define PRONTO_SAW2_SAW2_VERSION 0xFD0 #define PRONTO_SAW2_MAJOR_VER_OFFSET 0x1C -#define PRONTO_SAW2_MAJOR_VER_3 0x3 -#define PRONTO_SAW2_SPM_SLP_SEQ 0x80 -#define PRONTO_SAW2_SPM_SLP_SEQ_2 0x400 -#define PRONTO_SAW2_SPM_SLP_SEQ_OFFSET 0x04 -#define PRONTO_SAW2_SPM_SLP_SEQ_COUNT 0x08 #define PRONTO_PLL_STATUS_OFFSET 0x1c #define PRONTO_PLL_MODE_OFFSET 0x1c0 @@ -595,8 +590,7 @@ void wcnss_pronto_is_a2xb_bus_stall(void *tst_addr, u32 fifo_mask, char *type) void wcnss_pronto_log_debug_regs(void) { void __iomem *reg_addr, *tst_addr, *tst_ctrl_addr; - u32 reg = 0, reg2 = 0, reg3 = 0, reg4 = 0, offset_addr = 0; - int i; + u32 reg = 0, reg2 = 0, reg3 = 0, reg4 = 0; reg_addr = penv->msm_wcnss_base + PRONTO_PMU_SPARE_OFFSET; @@ -640,18 +634,6 @@ void wcnss_pronto_log_debug_regs(void) pr_err("PRONTO_SAW2_SAW2_VERSION %08x\n", reg); reg >>= PRONTO_SAW2_MAJOR_VER_OFFSET; - if (reg >= PRONTO_SAW2_MAJOR_VER_3) - offset_addr = PRONTO_SAW2_SPM_SLP_SEQ_2; - else - offset_addr = PRONTO_SAW2_SPM_SLP_SEQ; - - for (i = 0; i <= PRONTO_SAW2_SPM_SLP_SEQ_COUNT; i++) { - reg_addr = penv->pronto_saw2_base + offset_addr - + (i * PRONTO_SAW2_SPM_SLP_SEQ_OFFSET); - reg = readl_relaxed(reg_addr); - pr_err("PRONTO_SAW2_SPM_SLP_SEQ_ENTRY_%d %08x\n", i, reg); - } - reg_addr = penv->pronto_pll_base + PRONTO_PLL_STATUS_OFFSET; reg = readl_relaxed(reg_addr); pr_err("PRONTO_PLL_STATUS %08x\n", reg); |