Remove register table abstraction layer.
Use direct defines for ar988x.
Signed-off-by: Janusz Dziedzic janusz.dzied...@tieto.com
---
drivers/net/wireless/ath/ath10k/Makefile |4 +-
drivers/net/wireless/ath/ath10k/ar9888_regtable.c | 167 -
drivers/net/wireless/ath/ath10k/ar9888_regtable.h | 26 ---
drivers/net/wireless/ath/ath10k/ar9888def.h |3 +
drivers/net/wireless/ath/ath10k/ce.c |1 -
drivers/net/wireless/ath/ath10k/ce.h |6 +-
drivers/net/wireless/ath/ath10k/core.h|1 -
drivers/net/wireless/ath/ath10k/pci.c | 179 +-
drivers/net/wireless/ath/ath10k/pci.h |9 +-
drivers/net/wireless/ath/ath10k/regtable.c| 43 -
drivers/net/wireless/ath/ath10k/regtable.h| 206 -
11 files changed, 97 insertions(+), 548 deletions(-)
delete mode 100644 drivers/net/wireless/ath/ath10k/ar9888_regtable.c
delete mode 100644 drivers/net/wireless/ath/ath10k/ar9888_regtable.h
delete mode 100644 drivers/net/wireless/ath/ath10k/regtable.c
delete mode 100644 drivers/net/wireless/ath/ath10k/regtable.h
diff --git a/drivers/net/wireless/ath/ath10k/Makefile
b/drivers/net/wireless/ath/ath10k/Makefile
index efd8798..a4179f4 100644
--- a/drivers/net/wireless/ath/ath10k/Makefile
+++ b/drivers/net/wireless/ath/ath10k/Makefile
@@ -14,9 +14,7 @@ ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o
obj-$(CONFIG_ATH10K_PCI) += ath10k_pci.o
ath10k_pci-y += pci.o \
- ce.o \
- regtable.o \
- ar9888_regtable.o
+ ce.o
# for tracing framework to find trace.h
CFLAGS_trace.o := -I$(src)
diff --git a/drivers/net/wireless/ath/ath10k/ar9888_regtable.c
b/drivers/net/wireless/ath/ath10k/ar9888_regtable.c
deleted file mode 100644
index 5e0b25a..000
--- a/drivers/net/wireless/ath/ath10k/ar9888_regtable.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2005-2011 Atheros Communications Inc.
- * Copyright (c) 2011-2013 Qualcomm Atheros, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include ar9888_regtable.h
-#include ar9888def.h
-
-/* AR9888_V1 hostdef, targetdef structures */
-static struct targetdef ar9888_target_def = {
- .D_RTC_SOC_BASE_ADDRESS = RTC_SOC_BASE_ADDRESS,
- .D_RTC_WMAC_BASE_ADDRESS = RTC_WMAC_BASE_ADDRESS,
- .D_SYSTEM_SLEEP_OFFSET =WLAN_SYSTEM_SLEEP_OFFSET,
- .D_WLAN_SYSTEM_SLEEP_OFFSET = WLAN_SYSTEM_SLEEP_OFFSET,
- .D_WLAN_SYSTEM_SLEEP_DISABLE_LSB = WLAN_SYSTEM_SLEEP_DISABLE_LSB,
- .D_WLAN_SYSTEM_SLEEP_DISABLE_MASK = WLAN_SYSTEM_SLEEP_DISABLE_MASK,
- .D_CLOCK_CONTROL_OFFSET = CLOCK_CONTROL_OFFSET,
- .D_CLOCK_CONTROL_SI0_CLK_MASK = CLOCK_CONTROL_SI0_CLK_MASK,
- .D_RESET_CONTROL_OFFSET = SOC_RESET_CONTROL_OFFSET,
- .D_RESET_CONTROL_MBOX_RST_MASK =RESET_CONTROL_MBOX_RST_MASK,
- .D_RESET_CONTROL_SI0_RST_MASK = RESET_CONTROL_SI0_RST_MASK,
- .D_WLAN_RESET_CONTROL_OFFSET = WLAN_RESET_CONTROL_OFFSET,
- .D_WLAN_RESET_CONTROL_COLD_RST_MASK =
WLAN_RESET_CONTROL_COLD_RST_MASK,
- .D_WLAN_RESET_CONTROL_WARM_RST_MASK =
WLAN_RESET_CONTROL_WARM_RST_MASK,
- .D_GPIO_BASE_ADDRESS = GPIO_BASE_ADDRESS,
- .D_GPIO_PIN0_OFFSET = GPIO_PIN0_OFFSET,
- .D_GPIO_PIN1_OFFSET = GPIO_PIN1_OFFSET,
- .D_GPIO_PIN0_CONFIG_MASK = GPIO_PIN0_CONFIG_MASK,
- .D_GPIO_PIN1_CONFIG_MASK = GPIO_PIN1_CONFIG_MASK,
- .D_SI_CONFIG_BIDIR_OD_DATA_LSB =SI_CONFIG_BIDIR_OD_DATA_LSB,
- .D_SI_CONFIG_BIDIR_OD_DATA_MASK = SI_CONFIG_BIDIR_OD_DATA_MASK,
- .D_SI_CONFIG_I2C_LSB = SI_CONFIG_I2C_LSB,
- .D_SI_CONFIG_I2C_MASK = SI_CONFIG_I2C_MASK,
- .D_SI_CONFIG_POS_SAMPLE_LSB = SI_CONFIG_POS_SAMPLE_LSB,
- .D_SI_CONFIG_POS_SAMPLE_MASK = SI_CONFIG_POS_SAMPLE_MASK,
- .D_SI_CONFIG_INACTIVE_CLK_LSB = SI_CONFIG_INACTIVE_CLK_LSB,
- .D_SI_CONFIG_INACTIVE_CLK_MASK =SI_CONFIG_INACTIVE_CLK_MASK,
-
