Commit 9bc6772e authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville

wl1251: move to it's own directory

wl1271 driver is under heavy development but on the other hand the older
wl1251 driver is currently considered more as a legacy driver. To make it
easier to develop wl1271 features move wl1251 to it's own directory,
drivers/net/wireless/wl1251.

There are no functional changes, only moving of files. One regression
is that Kconfig won't be updated automatically and user needs to enable
wl1251 manually with an older config file.
Signed-off-by: default avatarKalle Valo <kvalo@adurom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f03ee1ec
...@@ -279,6 +279,7 @@ source "drivers/net/wireless/libertas/Kconfig" ...@@ -279,6 +279,7 @@ source "drivers/net/wireless/libertas/Kconfig"
source "drivers/net/wireless/orinoco/Kconfig" source "drivers/net/wireless/orinoco/Kconfig"
source "drivers/net/wireless/p54/Kconfig" source "drivers/net/wireless/p54/Kconfig"
source "drivers/net/wireless/rt2x00/Kconfig" source "drivers/net/wireless/rt2x00/Kconfig"
source "drivers/net/wireless/wl1251/Kconfig"
source "drivers/net/wireless/wl12xx/Kconfig" source "drivers/net/wireless/wl12xx/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig"
......
...@@ -49,6 +49,7 @@ obj-$(CONFIG_ATH_COMMON) += ath/ ...@@ -49,6 +49,7 @@ obj-$(CONFIG_ATH_COMMON) += ath/
obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o
obj-$(CONFIG_WL1251) += wl1251/
obj-$(CONFIG_WL12XX) += wl12xx/ obj-$(CONFIG_WL12XX) += wl12xx/
obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/ obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/
......
menuconfig WL1251
tristate "TI wl1251 driver support"
depends on MAC80211 && EXPERIMENTAL && GENERIC_HARDIRQS
select FW_LOADER
select CRC7
---help---
This will enable TI wl1251 driver support. The drivers make
use of the mac80211 stack.
If you choose to build a module, it'll be called wl1251. Say
N if unsure.
config WL1251_SPI
tristate "TI wl1251 SPI support"
depends on WL1251 && SPI_MASTER
---help---
This module adds support for the SPI interface of adapters using
TI wl1251 chipset. Select this if your platform is using
the SPI bus.
If you choose to build a module, it'll be called wl1251_spi.
Say N if unsure.
config WL1251_SDIO
tristate "TI wl1251 SDIO support"
depends on WL1251 && MMC
---help---
This module adds support for the SDIO interface of adapters using
TI wl1251 chipset. Select this if your platform is using
the SDIO bus.
If you choose to build a module, it'll be called
wl1251_sdio. Say N if unsure.
wl1251-objs = main.o event.o tx.o rx.o ps.o cmd.o \
acx.o boot.o init.o debugfs.o io.o
obj-$(CONFIG_WL1251) += wl1251.o
obj-$(CONFIG_WL1251_SPI) += spi.o
obj-$(CONFIG_WL1251_SDIO) += sdio.o
#include "wl1251_acx.h" #include "acx.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/crc7.h> #include <linux/crc7.h>
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_cmd.h" #include "cmd.h"
#include "wl1251_ps.h" #include "ps.h"
int wl1251_acx_frame_rates(struct wl1251 *wl, u8 ctrl_rate, u8 ctrl_mod, int wl1251_acx_frame_rates(struct wl1251 *wl, u8 ctrl_rate, u8 ctrl_mod,
u8 mgt_rate, u8 mgt_mod) u8 mgt_rate, u8 mgt_mod)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define __WL1251_ACX_H__ #define __WL1251_ACX_H__
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_cmd.h" #include "cmd.h"
/* Target's information element */ /* Target's information element */
struct acx_header { struct acx_header {
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_boot.h" #include "boot.h"
#include "wl1251_io.h" #include "io.h"
#include "wl1251_spi.h" #include "spi.h"
#include "wl1251_event.h" #include "event.h"
#include "wl1251_acx.h" #include "acx.h"
void wl1251_boot_target_enable_interrupts(struct wl1251 *wl) void wl1251_boot_target_enable_interrupts(struct wl1251 *wl)
{ {
......
#include "wl1251_cmd.h" #include "cmd.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/crc7.h> #include <linux/crc7.h>
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_io.h" #include "io.h"
#include "wl1251_ps.h" #include "ps.h"
#include "wl1251_acx.h" #include "acx.h"
/** /**
* send command to firmware * send command to firmware
......
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
* *
*/ */
#include "wl1251_debugfs.h" #include "debugfs.h"
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_acx.h" #include "acx.h"
#include "wl1251_ps.h" #include "ps.h"
/* ms */ /* ms */
#define WL1251_DEBUGFS_STATS_LIFETIME 1000 #define WL1251_DEBUGFS_STATS_LIFETIME 1000
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
*/ */
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_io.h" #include "io.h"
#include "wl1251_event.h" #include "event.h"
#include "wl1251_ps.h" #include "ps.h"
static int wl1251_event_scan_complete(struct wl1251 *wl, static int wl1251_event_scan_complete(struct wl1251 *wl,
struct event_mailbox *mbox) struct event_mailbox *mbox)
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "wl1251_init.h" #include "init.h"
#include "wl12xx_80211.h" #include "wl12xx_80211.h"
#include "wl1251_acx.h" #include "acx.h"
#include "wl1251_cmd.h" #include "cmd.h"
#include "wl1251_reg.h" #include "reg.h"
int wl1251_hw_init_hwenc_config(struct wl1251 *wl) int wl1251_hw_init_hwenc_config(struct wl1251 *wl)
{ {
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
*/ */
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_io.h" #include "io.h"
/* FIXME: this is static data nowadays and the table can be removed */ /* FIXME: this is static data nowadays and the table can be removed */
static enum wl12xx_acx_int_reg wl1251_io_reg_table[ACX_REG_TABLE_LEN] = { static enum wl12xx_acx_int_reg wl1251_io_reg_table[ACX_REG_TABLE_LEN] = {
......
...@@ -31,16 +31,16 @@ ...@@ -31,16 +31,16 @@
#include "wl1251.h" #include "wl1251.h"
#include "wl12xx_80211.h" #include "wl12xx_80211.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_io.h" #include "io.h"
#include "wl1251_cmd.h" #include "cmd.h"
#include "wl1251_event.h" #include "event.h"
#include "wl1251_tx.h" #include "tx.h"
#include "wl1251_rx.h" #include "rx.h"
#include "wl1251_ps.h" #include "ps.h"
#include "wl1251_init.h" #include "init.h"
#include "wl1251_debugfs.h" #include "debugfs.h"
#include "wl1251_boot.h" #include "boot.h"
void wl1251_enable_interrupts(struct wl1251 *wl) void wl1251_enable_interrupts(struct wl1251 *wl)
{ {
......
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
* *
*/ */
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_ps.h" #include "ps.h"
#include "wl1251_cmd.h" #include "cmd.h"
#include "wl1251_io.h" #include "io.h"
/* in ms */ /* in ms */
#define WL1251_WAKEUP_TIMEOUT 100 #define WL1251_WAKEUP_TIMEOUT 100
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define __WL1251_PS_H__ #define __WL1251_PS_H__
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_acx.h" #include "acx.h"
int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode); int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode);
void wl1251_ps_elp_sleep(struct wl1251 *wl); void wl1251_ps_elp_sleep(struct wl1251 *wl);
......
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
#include <net/mac80211.h> #include <net/mac80211.h>
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_io.h" #include "io.h"
#include "wl1251_rx.h" #include "rx.h"
#include "wl1251_cmd.h" #include "cmd.h"
#include "wl1251_acx.h" #include "acx.h"
static void wl1251_rx_header(struct wl1251 *wl, static void wl1251_rx_header(struct wl1251 *wl,
struct wl1251_rx_descriptor *desc) struct wl1251_rx_descriptor *desc)
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include <linux/wl12xx.h> #include <linux/wl12xx.h>
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_spi.h" #include "spi.h"
static irqreturn_t wl1251_irq(int irq, void *cookie) static irqreturn_t wl1251_irq(int irq, void *cookie)
{ {
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#ifndef __WL1251_SPI_H__ #ifndef __WL1251_SPI_H__
#define __WL1251_SPI_H__ #define __WL1251_SPI_H__
#include "wl1251_cmd.h" #include "cmd.h"
#include "wl1251_acx.h" #include "acx.h"
#include "wl1251_reg.h" #include "reg.h"
#define WSPI_CMD_READ 0x40000000 #define WSPI_CMD_READ 0x40000000
#define WSPI_CMD_WRITE 0x00000000 #define WSPI_CMD_WRITE 0x00000000
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <linux/module.h> #include <linux/module.h>
#include "wl1251.h" #include "wl1251.h"
#include "wl1251_reg.h" #include "reg.h"
#include "wl1251_tx.h" #include "tx.h"
#include "wl1251_ps.h" #include "ps.h"
#include "wl1251_io.h" #include "io.h"
static bool wl1251_tx_double_buffer_busy(struct wl1251 *wl, u32 data_out_count) static bool wl1251_tx_double_buffer_busy(struct wl1251 *wl, u32 data_out_count)
{ {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define __WL1251_TX_H__ #define __WL1251_TX_H__
#include <linux/bitops.h> #include <linux/bitops.h>
#include "wl1251_acx.h" #include "acx.h"
/* /*
* *
......
...@@ -5,40 +5,6 @@ menuconfig WL12XX ...@@ -5,40 +5,6 @@ menuconfig WL12XX
This will enable TI wl12xx driver support. The drivers make This will enable TI wl12xx driver support. The drivers make
use of the mac80211 stack. use of the mac80211 stack.
config WL1251
tristate "TI wl1251 support"
depends on WL12XX && GENERIC_HARDIRQS
select FW_LOADER
select CRC7
---help---
This module adds support for wireless adapters based on
TI wl1251 chipset.
If you choose to build a module, it'll be called wl1251. Say
N if unsure.
config WL1251_SPI
tristate "TI wl1251 SPI support"
depends on WL1251 && SPI_MASTER
---help---
This module adds support for the SPI interface of adapters using
TI wl1251 chipset. Select this if your platform is using
the SPI bus.
If you choose to build a module, it'll be called wl1251_spi.
Say N if unsure.
config WL1251_SDIO
tristate "TI wl1251 SDIO support"
depends on WL1251 && MMC
---help---
This module adds support for the SDIO interface of adapters using
TI wl1251 chipset. Select this if your platform is using
the SDIO bus.
If you choose to build a module, it'll be called
wl1251_sdio. Say N if unsure.
config WL1271 config WL1271
tristate "TI wl1271 support" tristate "TI wl1271 support"
depends on WL12XX && GENERIC_HARDIRQS depends on WL12XX && GENERIC_HARDIRQS
......
wl1251-objs = wl1251_main.o wl1251_event.o \
wl1251_tx.o wl1251_rx.o wl1251_ps.o wl1251_cmd.o \
wl1251_acx.o wl1251_boot.o wl1251_init.o \
wl1251_debugfs.o wl1251_io.o
obj-$(CONFIG_WL1251) += wl1251.o
obj-$(CONFIG_WL1251_SPI) += wl1251_spi.o
obj-$(CONFIG_WL1251_SDIO) += wl1251_sdio.o
wl1271-objs = wl1271_main.o wl1271_cmd.o wl1271_io.o \ wl1271-objs = wl1271_main.o wl1271_cmd.o wl1271_io.o \
wl1271_event.o wl1271_tx.o wl1271_rx.o \ wl1271_event.o wl1271_tx.o wl1271_rx.o \
wl1271_ps.o wl1271_acx.o wl1271_boot.o \ wl1271_ps.o wl1271_acx.o wl1271_boot.o \
......
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