75 files changed, 71854 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 040a51525b42..99375f0a9440 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -52,6 +52,8 @@ source "drivers/staging/rtl8712/Kconfig"
 source "drivers/staging/rtl8188eu/Kconfig"
+source "drivers/staging/rtl8821ae/Kconfig"
 source "drivers/staging/rts5139/Kconfig"
 source "drivers/staging/rts5208/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index dea056bf7ff2..ddc3c4a5d39d 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_RTL8192U)		+= rtl8192u/
 obj-$(CONFIG_RTL8192E)          += rtl8192e/
 obj-$(CONFIG_R8712U)            += rtl8712/
 obj-$(CONFIG_R8188EU)           += rtl8188eu/
+obj-$(CONFIG_R8821AE)           += rtl8821ae/
 obj-$(CONFIG_RTS5139)           += rts5139/
 obj-$(CONFIG_RTS5208)           += rts5208/
 obj-$(CONFIG_TRANZPORT)         += frontier/
diff --git a/drivers/staging/rtl8821ae/Kconfig b/drivers/staging/rtl8821ae/Kconfig
new file mode 100644
index 000000000000..2aa5dac2f1df
--- /dev/null
+++ b/drivers/staging/rtl8821ae/Kconfig
@@ -0,0 +1,11 @@
+config R8821AE
+        tristate "RealTek RTL8821AE Wireless LAN NIC driver"
+        depends on PCI && WLAN
+        depends on m
+        select WIRELESS_EXT
+        select WEXT_PRIV
+        select EEPROM_93CX6
+        select CRYPTO
+        default N
+        ---help---
+          If built as a module, it will be called r8821ae.ko.
diff --git a/drivers/staging/rtl8821ae/Makefile b/drivers/staging/rtl8821ae/Makefile
new file mode 100644
index 000000000000..8a23bd7e8842
--- /dev/null
+++ b/drivers/staging/rtl8821ae/Makefile
@@ -0,0 +1,35 @@
+PCI_MAIN_OBJS   := base.o       \
+                rc.o    \
+                debug.o \
+                regd.o  \
+                efuse.o \
+                cam.o   \
+                ps.o    \
+                core.o  \
+                stats.o \
+                pci.o   \
+BT_COEXIST_OBJS:=       btcoexist/halbtc8192e2ant.o\
+                        btcoexist/halbtc8723b1ant.o\
+                        btcoexist/halbtc8723b2ant.o\
+                        btcoexist/halbtcoutsrc.o\
+                        btcoexist/rtl_btc.o     \
+PCI_8821AE_HAL_OBJS:=   \
+        rtl8821ae/hw.o          \
+        rtl8821ae/table.o               \
+        rtl8821ae/sw.o          \
+        rtl8821ae/trx.o         \
+        rtl8821ae/led.o         \
+        rtl8821ae/fw.o          \
+        rtl8821ae/phy.o         \
+        rtl8821ae/rf.o          \
+        rtl8821ae/dm.o          \
+        rtl8821ae/pwrseq.o      \
+        rtl8821ae/pwrseqcmd.o   \
+        rtl8821ae/hal_btc.o     \
+        rtl8821ae/hal_bt_coexist.o      \
+rtl8821ae-objs += $(BT_COEXIST_OBJS) $(PCI_MAIN_OBJS) $(PCI_8821AE_HAL_OBJS)

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 040a51525b42..99375f0a9440 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig
@@ -52,6 +52,8 @@ source "drivers/staging/rtl8712/Kconfig"
52		52
53	source "drivers/staging/rtl8188eu/Kconfig"	53	source "drivers/staging/rtl8188eu/Kconfig"
54		54
		55	source "drivers/staging/rtl8821ae/Kconfig"
		56
55	source "drivers/staging/rts5139/Kconfig"	57	source "drivers/staging/rts5139/Kconfig"
56		58
57	source "drivers/staging/rts5208/Kconfig"	59	source "drivers/staging/rts5208/Kconfig"


diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index dea056bf7ff2..ddc3c4a5d39d 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_RTL8192U) += rtl8192u/
18	obj-$(CONFIG_RTL8192E) += rtl8192e/	18	obj-$(CONFIG_RTL8192E) += rtl8192e/
19	obj-$(CONFIG_R8712U) += rtl8712/	19	obj-$(CONFIG_R8712U) += rtl8712/
20	obj-$(CONFIG_R8188EU) += rtl8188eu/	20	obj-$(CONFIG_R8188EU) += rtl8188eu/
		21	obj-$(CONFIG_R8821AE) += rtl8821ae/
21	obj-$(CONFIG_RTS5139) += rts5139/	22	obj-$(CONFIG_RTS5139) += rts5139/
22	obj-$(CONFIG_RTS5208) += rts5208/	23	obj-$(CONFIG_RTS5208) += rts5208/
23	obj-$(CONFIG_TRANZPORT) += frontier/	24	obj-$(CONFIG_TRANZPORT) += frontier/


diff --git a/drivers/staging/rtl8821ae/Kconfig b/drivers/staging/rtl8821ae/Kconfig new file mode 100644 index 000000000000..2aa5dac2f1df --- /dev/null +++ b/drivers/staging/rtl8821ae/Kconfig
@@ -0,0 +1,11 @@
		1	config R8821AE
		2	tristate "RealTek RTL8821AE Wireless LAN NIC driver"
		3	depends on PCI && WLAN
		4	depends on m
		5	select WIRELESS_EXT
		6	select WEXT_PRIV
		7	select EEPROM_93CX6
		8	select CRYPTO
		9	default N
		10	---help---
		11	If built as a module, it will be called r8821ae.ko.


diff --git a/drivers/staging/rtl8821ae/Makefile b/drivers/staging/rtl8821ae/Makefile new file mode 100644 index 000000000000..8a23bd7e8842 --- /dev/null +++ b/drivers/staging/rtl8821ae/Makefile
@@ -0,0 +1,35 @@
		1	PCI_MAIN_OBJS := base.o \
		2	rc.o \
		3	debug.o \
		4	regd.o \
		5	efuse.o \
		6	cam.o \
		7	ps.o \
		8	core.o \
		9	stats.o \
		10	pci.o \
		11
		12	BT_COEXIST_OBJS:= btcoexist/halbtc8192e2ant.o\
		13	btcoexist/halbtc8723b1ant.o\
		14	btcoexist/halbtc8723b2ant.o\
		15	btcoexist/halbtcoutsrc.o\
		16	btcoexist/rtl_btc.o \
		17
		18	PCI_8821AE_HAL_OBJS:= \
		19	rtl8821ae/hw.o \
		20	rtl8821ae/table.o \
		21	rtl8821ae/sw.o \
		22	rtl8821ae/trx.o \
		23	rtl8821ae/led.o \
		24	rtl8821ae/fw.o \
		25	rtl8821ae/phy.o \
		26	rtl8821ae/rf.o \
		27	rtl8821ae/dm.o \
		28	rtl8821ae/pwrseq.o \
		29	rtl8821ae/pwrseqcmd.o \
		30	rtl8821ae/hal_btc.o \
		31	rtl8821ae/hal_bt_coexist.o \
		32
		33	rtl8821ae-objs += $(BT_COEXIST_OBJS) $(PCI_MAIN_OBJS) $(PCI_8821AE_HAL_OBJS)
		34