Commit 416e87fc authored by Zong-Zhe Yang's avatar Zong-Zhe Yang Committed by Kalle Valo
Browse files

rtw88: extract: make 8822b an individual kernel module 



Make objects about 8822b functions and 8822b tables,
i.e. rtw8822b.o and rtw8822b_table.o, an individual
kernel module called rtw88_8822b.ko.

For 8822b pcie chip, i.e. 8822BE chip, add a chip
entry point module called rtw88_8822be.ko which
will depend on rtw88_8822b.ko and rtwpci.ko.

Signed-off-by: default avatarZong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: default avatarYan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200515052327.31874-5-yhchuang@realtek.com
parent ba0fbe23

drivers/net/wireless/realtek/rtw88/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -16,14 +16,18 @@ config RTW88_CORE 
config RTW88_PCI

	tristate



config RTW88_8822B

	tristate



config RTW88_8822C

	tristate



config RTW88_8822BE

	bool "Realtek 8822BE PCI wireless network adapter"

	tristate "Realtek 8822BE PCI wireless network adapter"

	depends on PCI

	select RTW88_CORE

	select RTW88_PCI

	select RTW88_8822B

	help

	  Select this option will enable support for 8822BE chipset

drivers/net/wireless/realtek/rtw88/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -18,9 +18,14 @@ rtw88-y += main.o \ 
	   wow.o \

	   regd.o



rtw88-$(CONFIG_RTW88_8822BE)	+= rtw8822b.o rtw8822b_table.o

rtw88-$(CONFIG_RTW88_8723DE)	+= rtw8723d.o rtw8723d_table.o



obj-$(CONFIG_RTW88_8822B)	+= rtw88_8822b.o

rtw88_8822b-objs		:= rtw8822b.o rtw8822b_table.o



obj-$(CONFIG_RTW88_8822BE)	+= rtw88_8822be.o

rtw88_8822be-objs		:= rtw8822be.o



obj-$(CONFIG_RTW88_8822C)	+= rtw88_8822c.o

rtw88_8822c-objs		:= rtw8822c.o rtw8822c_table.o

drivers/net/wireless/realtek/rtw88/main.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ extern bool rtw_bf_support; 
extern unsigned int rtw_fw_lps_deep_mode;

extern unsigned int rtw_debug_mask;

extern const struct ieee80211_ops rtw_ops;

extern struct rtw_chip_info rtw8822b_hw_spec;

extern struct rtw_chip_info rtw8723d_hw_spec;



#define RTW_MAX_CHANNEL_NUM_2G 14

drivers/net/wireless/realtek/rtw88/pci.c

+0 −3
Original line number Diff line number Diff line
@@ -1594,9 +1594,6 @@ void rtw_pci_shutdown(struct pci_dev *pdev) 
EXPORT_SYMBOL(rtw_pci_shutdown);



static const struct pci_device_id rtw_pci_id_table[] = {

#ifdef CONFIG_RTW88_8822BE

	{ RTK_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xB822, rtw8822b_hw_spec) },

#endif

#ifdef CONFIG_RTW88_8723DE

	{ RTK_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xD723, rtw8723d_hw_spec) },

#endif

drivers/net/wireless/realtek/rtw88/rtw8822b.c

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright(c) 2018-2019  Realtek Corporation

 */



#include <linux/module.h>

#include "main.h"

#include "coex.h"

#include "fw.h"
@@ -2506,3 +2507,7 @@ struct rtw_chip_info rtw8822b_hw_spec = { 
EXPORT_SYMBOL(rtw8822b_hw_spec);



MODULE_FIRMWARE("rtw88/rtw8822b_fw.bin");



MODULE_AUTHOR("Realtek Corporation");

MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822b driver");

MODULE_LICENSE("Dual BSD/GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE