Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/net/wireless/wl12xx/Kconfig

+27 −25
Original line number Diff line number Diff line 
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

drivers/net/wireless/wl12xx/Makefile

+9 −8
Original line number Diff line number Diff line 
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

drivers/net/wireless/wl12xx/wl1271_acx.c→drivers/net/wireless/wl12xx/acx.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

{

drivers/net/wireless/wl12xx/wl1271_acx.h→drivers/net/wireless/wl12xx/acx.h

+4 −4
Original line number Diff line number Diff line
@@ -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"



/*************************************************************************

drivers/net/wireless/wl12xx/wl1271_boot.c→drivers/net/wireless/wl12xx/boot.c

+5 −5
Original line number Diff line number Diff line
@@ -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] = {