Commit 00d20100 authored by Shahar Levi's avatar Shahar Levi Committed by Luciano Coelho
Browse files

wl1271: Change wl12xx Files Names



All files name prefix removed due to the fact that wl12xx driver supports
wl1271 and wl1273.
Also the definition in Kconfig and header files changed respectively.
Signed-off-by: default avatarShahar Levi <shahar_levi@ti.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
parent a76a574c
menuconfig WL12XX
menuconfig WL12XX_MENU
tristate "TI wl12xx driver support"
depends on MAC80211 && EXPERIMENTAL
---help---
This will enable TI wl12xx driver support. The drivers make
use of the mac80211 stack.
This will enable TI wl12xx driver support for the following chips:
wl1271 and wl1273.
The drivers make use of the mac80211 stack.
config WL1271
tristate "TI wl1271 support"
depends on WL12XX && GENERIC_HARDIRQS
config WL12XX
tristate "TI wl12xx support"
depends on WL12XX_MENU && GENERIC_HARDIRQS
depends on INET
select FW_LOADER
select CRC7
---help---
This module adds support for wireless adapters based on the
TI wl1271 chipset.
This module adds support for wireless adapters based on TI wl1271 and
TI wl1273 chipsets. This module does *not* include support for wl1251.
For wl1251 support, use the separate homonymous driver instead.
If you choose to build a module, it'll be called wl1271. Say N if
If you choose to build a module, it will be called wl12xx. Say N if
unsure.
config WL1271_HT
bool "TI wl1271 802.11 HT support (EXPERIMENTAL)"
depends on WL1271 && EXPERIMENTAL
config WL12XX_HT
bool "TI wl12xx 802.11 HT support (EXPERIMENTAL)"
depends on WL12XX && EXPERIMENTAL
default n
---help---
This will enable 802.11 HT support for TI wl1271 chipset.
This will enable 802.11 HT support in the wl12xx module.
That configuration is temporary due to the code incomplete and
still in testing process.
config WL1271_SPI
tristate "TI wl1271 SPI support"
depends on WL1271 && SPI_MASTER
config WL12XX_SPI
tristate "TI wl12xx SPI support"
depends on WL12XX && SPI_MASTER
---help---
This module adds support for the SPI interface of adapters using
TI wl1271 chipset. Select this if your platform is using
TI wl12xx chipsets. Select this if your platform is using
the SPI bus.
If you choose to build a module, it'll be called wl1251_spi.
If you choose to build a module, it'll be called wl12xx_spi.
Say N if unsure.
config WL1271_SDIO
tristate "TI wl1271 SDIO support"
depends on WL1271 && MMC
config WL12XX_SDIO
tristate "TI wl12xx SDIO support"
depends on WL12XX && MMC
---help---
This module adds support for the SDIO interface of adapters using
TI wl1271 chipset. Select this if your platform is using
TI wl12xx chipsets. Select this if your platform is using
the SDIO bus.
If you choose to build a module, it'll be called
wl1271_sdio. Say N if unsure.
If you choose to build a module, it'll be called wl12xx_sdio.
Say N if unsure.
config WL12XX_PLATFORM_DATA
bool
depends on WL1271_SDIO != n || WL1251_SDIO != n
depends on WL12XX_SDIO != n || WL1251_SDIO != n
default y
wl1271-objs = wl1271_main.o wl1271_cmd.o wl1271_io.o \
wl1271_event.o wl1271_tx.o wl1271_rx.o \
wl1271_ps.o wl1271_acx.o wl1271_boot.o \
wl1271_init.o wl1271_debugfs.o wl1271_scan.o
wl12xx-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
boot.o init.o debugfs.o scan.o
wl1271-$(CONFIG_NL80211_TESTMODE) += wl1271_testmode.o
obj-$(CONFIG_WL1271) += wl1271.o
obj-$(CONFIG_WL1271_SPI) += wl1271_spi.o
obj-$(CONFIG_WL1271_SDIO) += wl1271_sdio.o
wl12xx_spi-objs = spi.o
wl12xx_sdio-objs = sdio.o
wl12xx-$(CONFIG_NL80211_TESTMODE) += testmode.o
obj-$(CONFIG_WL12XX) += wl12xx.o
obj-$(CONFIG_WL12XX_SPI) += wl12xx_spi.o
obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o
# small builtin driver bit
obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o
......@@ -21,7 +21,7 @@
*
*/
#include "wl1271_acx.h"
#include "acx.h"
#include <linux/module.h>
#include <linux/platform_device.h>
......@@ -29,10 +29,10 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>
#include "wl1271.h"
#include "wl12xx.h"
#include "wl12xx_80211.h"
#include "wl1271_reg.h"
#include "wl1271_ps.h"
#include "reg.h"
#include "ps.h"
int wl1271_acx_wake_up_conditions(struct wl1271 *wl)
{
......
......@@ -22,11 +22,11 @@
*
*/
#ifndef __WL1271_ACX_H__
#define __WL1271_ACX_H__
#ifndef __ACX_H__
#define __ACX_H__
#include "wl1271.h"
#include "wl1271_cmd.h"
#include "wl12xx.h"
#include "cmd.h"
/*************************************************************************
......
......@@ -24,11 +24,11 @@
#include <linux/gpio.h>
#include <linux/slab.h>
#include "wl1271_acx.h"
#include "wl1271_reg.h"
#include "wl1271_boot.h"
#include "wl1271_io.h"
#include "wl1271_event.h"
#include "acx.h"
#include "reg.h"
#include "boot.h"
#include "io.h"
#include "event.h"
static struct wl1271_partition_set part_table[PART_TABLE_LEN] = {
[PART_DOWN] = {
......
......@@ -24,7 +24,7 @@
#ifndef __BOOT_H__
#define __BOOT_H__
#include "wl1271.h"
#include "wl12xx.h"
int wl1271_boot(struct wl1271 *wl);
......
......@@ -29,13 +29,13 @@
#include <linux/ieee80211.h>
#include <linux/slab.h>
#include "wl1271.h"
#include "wl1271_reg.h"
#include "wl1271_io.h"
#include "wl1271_acx.h"
#include "wl12xx.h"
#include "reg.h"
#include "io.h"
#include "acx.h"
#include "wl12xx_80211.h"
#include "wl1271_cmd.h"
#include "wl1271_event.h"
#include "cmd.h"
#include "event.h"
#define WL1271_CMD_FAST_POLL_COUNT 50
......
......@@ -22,10 +22,10 @@
*
*/
#ifndef __WL1271_CMD_H__
#define __WL1271_CMD_H__
#ifndef __CMD_H__
#define __CMD_H__
#include "wl1271.h"
#include "wl12xx.h"
struct acx_header;
......
......@@ -21,8 +21,8 @@
*
*/
#ifndef __WL1271_CONF_H__
#define __WL1271_CONF_H__
#ifndef __CONF_H__
#define __CONF_H__
enum {
CONF_HW_BIT_RATE_1MBPS = BIT(0),
......
......@@ -21,15 +21,15 @@
*
*/
#include "wl1271_debugfs.h"
#include "debugfs.h"
#include <linux/skbuff.h>
#include <linux/slab.h>
#include "wl1271.h"
#include "wl1271_acx.h"
#include "wl1271_ps.h"
#include "wl1271_io.h"
#include "wl12xx.h"
#include "acx.h"
#include "ps.h"
#include "io.h"
/* ms */
#define WL1271_DEBUGFS_STATS_LIFETIME 1000
......
......@@ -21,10 +21,10 @@
*
*/
#ifndef WL1271_DEBUGFS_H
#define WL1271_DEBUGFS_H
#ifndef __DEBUGFS_H__
#define __DEBUGFS_H__
#include "wl1271.h"
#include "wl12xx.h"
int wl1271_debugfs_init(struct wl1271 *wl);
void wl1271_debugfs_exit(struct wl1271 *wl);
......
......@@ -21,12 +21,12 @@
*
*/
#include "wl1271.h"
#include "wl1271_reg.h"
#include "wl1271_io.h"
#include "wl1271_event.h"
#include "wl1271_ps.h"
#include "wl1271_scan.h"
#include "wl12xx.h"
#include "reg.h"
#include "io.h"
#include "event.h"
#include "ps.h"
#include "scan.h"
#include "wl12xx_80211.h"
void wl1271_pspoll_work(struct work_struct *work)
......
......@@ -22,8 +22,8 @@
*
*/
#ifndef __WL1271_EVENT_H__
#define __WL1271_EVENT_H__
#ifndef __EVENT_H__
#define __EVENT_H__
/*
* Mbox events
......
......@@ -21,8 +21,8 @@
*
*/
#ifndef __WL1271_INI_H__
#define __WL1271_INI_H__
#ifndef __INI_H__
#define __INI_H__
#define WL1271_INI_MAX_SMART_REFLEX_PARAM 16
......
......@@ -25,11 +25,11 @@
#include <linux/module.h>
#include <linux/slab.h>
#include "wl1271_init.h"
#include "init.h"
#include "wl12xx_80211.h"
#include "wl1271_acx.h"
#include "wl1271_cmd.h"
#include "wl1271_reg.h"
#include "acx.h"
#include "cmd.h"
#include "reg.h"
static int wl1271_init_hwenc_config(struct wl1271 *wl)
{
......
......@@ -21,10 +21,10 @@
*
*/
#ifndef __WL1271_INIT_H__
#define __WL1271_INIT_H__
#ifndef __INIT_H__
#define __INIT_H__
#include "wl1271.h"
#include "wl12xx.h"
int wl1271_hw_init_power_auth(struct wl1271 *wl);
int wl1271_init_templates_config(struct wl1271 *wl);
......
......@@ -26,9 +26,9 @@
#include <linux/crc7.h>
#include <linux/spi/spi.h>
#include "wl1271.h"
#include "wl12xx.h"
#include "wl12xx_80211.h"
#include "wl1271_io.h"
#include "io.h"
#define OCP_CMD_LOOP 32
......
......@@ -22,10 +22,10 @@
*
*/
#ifndef __WL1271_IO_H__
#define __WL1271_IO_H__
#ifndef __IO_H__
#define __IO_H__
#include "wl1271_reg.h"
#include "reg.h"
#define HW_ACCESS_MEMORY_MAX_RANGE 0x1FFC0
......
......@@ -31,20 +31,20 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include "wl1271.h"
#include "wl12xx.h"
#include "wl12xx_80211.h"
#include "wl1271_reg.h"
#include "wl1271_io.h"
#include "wl1271_event.h"
#include "wl1271_tx.h"
#include "wl1271_rx.h"
#include "wl1271_ps.h"
#include "wl1271_init.h"
#include "wl1271_debugfs.h"
#include "wl1271_cmd.h"
#include "wl1271_boot.h"
#include "wl1271_testmode.h"
#include "wl1271_scan.h"
#include "reg.h"
#include "io.h"
#include "event.h"
#include "tx.h"
#include "rx.h"
#include "ps.h"
#include "init.h"
#include "debugfs.h"
#include "cmd.h"
#include "boot.h"
#include "testmode.h"
#include "scan.h"
#define WL1271_BOOT_RETRIES 3
......@@ -884,7 +884,7 @@ static int wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
set_bit(WL1271_FLAG_STA_RATES_CHANGED, &wl->flags);
}
#ifdef CONFIG_WL1271_HT
#ifdef CONFIG_WL12XX_HT
if (sta &&
sta->ht_cap.ht_supported &&
((wl->sta_rate_set >> HW_HT_RATES_OFFSET) !=
......@@ -2247,8 +2247,8 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
/* 11n STA capabilities */
#define HW_RX_HIGHEST_RATE 72
#ifdef CONFIG_WL1271_HT
#define WL1271_HT_CAP { \
#ifdef CONFIG_WL12XX_HT
#define WL12XX_HT_CAP { \
.cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20, \
.ht_supported = true, \
.ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K, \
......@@ -2260,7 +2260,7 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
}, \
}
#else
#define WL1271_HT_CAP { \
#define WL12XX_HT_CAP { \
.ht_supported = false, \
}
#endif
......@@ -2271,7 +2271,7 @@ static struct ieee80211_supported_band wl1271_band_2ghz = {
.n_channels = ARRAY_SIZE(wl1271_channels),
.bitrates = wl1271_rates,
.n_bitrates = ARRAY_SIZE(wl1271_rates),
.ht_cap = WL1271_HT_CAP,
.ht_cap = WL12XX_HT_CAP,
};
/* 5 GHz data rates for WL1273 */
......@@ -2386,7 +2386,7 @@ static struct ieee80211_supported_band wl1271_band_5ghz = {
.n_channels = ARRAY_SIZE(wl1271_channels_5ghz),
.bitrates = wl1271_rates_5ghz,
.n_bitrates = ARRAY_SIZE(wl1271_rates_5ghz),
.ht_cap = WL1271_HT_CAP,
.ht_cap = WL12XX_HT_CAP,
};
static const u8 *wl1271_band_rate_to_idx[] = {
......
......@@ -21,9 +21,9 @@
*
*/
#include "wl1271_reg.h"
#include "wl1271_ps.h"
#include "wl1271_io.h"
#include "reg.h"
#include "ps.h"
#include "io.h"
#define WL1271_WAKEUP_TIMEOUT 500
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment