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

rtw88: extract: make 8822c an individual kernel module 



Make objects about 8822c functions and 8822c tables,
i.e. rtw8822c.o and rtw8822c_table.o, an individual
kernel module called rtw88_8822c.ko.

For 8822c pcie chip, i.e. 8822CE chip, add a chip
entry point module called rtw88_8822ce.ko which
will depend on rtw88_8822c.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-4-yhchuang@realtek.com
parent 72f256c2

drivers/net/wireless/realtek/rtw88/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ config RTW88_CORE 
config RTW88_PCI

	tristate



config RTW88_8822C

	tristate



config RTW88_8822BE

	bool "Realtek 8822BE PCI wireless network adapter"

	depends on PCI
@@ -27,10 +30,11 @@ config RTW88_8822BE 
	  802.11ac PCIe wireless network adapter



config RTW88_8822CE

	bool "Realtek 8822CE PCI wireless network adapter"

	tristate "Realtek 8822CE PCI wireless network adapter"

	depends on PCI

	select RTW88_CORE

	select RTW88_PCI

	select RTW88_8822C

	help

	  Select this option will enable support for 8822CE chipset

drivers/net/wireless/realtek/rtw88/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -19,8 +19,13 @@ rtw88-y += main.o \ 
	   regd.o



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

rtw88-$(CONFIG_RTW88_8822CE)	+= rtw8822c.o rtw8822c_table.o

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



obj-$(CONFIG_RTW88_8822C)	+= rtw88_8822c.o

rtw88_8822c-objs		:= rtw8822c.o rtw8822c_table.o



obj-$(CONFIG_RTW88_8822CE)	+= rtw88_8822ce.o

rtw88_8822ce-objs		:= rtw8822ce.o



obj-$(CONFIG_RTW88_PCI)		+= rtwpci.o

rtwpci-objs			:= pci.o

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

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 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 rtw8822c_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
@@ -1597,9 +1597,6 @@ 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_8822CE

	{ RTK_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xC822, rtw8822c_hw_spec) },

#endif

#ifdef CONFIG_RTW88_8723DE

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

#endif

drivers/net/wireless/realtek/rtw88/rtw8822c.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"
@@ -4377,3 +4378,7 @@ EXPORT_SYMBOL(rtw8822c_hw_spec); 


MODULE_FIRMWARE("rtw88/rtw8822c_fw.bin");

MODULE_FIRMWARE("rtw88/rtw8822c_wow_fw.bin");



MODULE_AUTHOR("Realtek Corporation");

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

MODULE_LICENSE("Dual BSD/GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE