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

rtw88: extract: make 8723d an individual kernel module 



Make objects about 8723d functions and 8723d tables,
i.e. rtw8723d.o and rtw8723d_table.o, an individual
kernel module called rtw88_8723d.ko.

For 8723d pcie chip, i.e. 8723DE chip, add a chip
entry point module called rtw88_8723de.ko which
will depend on rtw88_8723d.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-6-yhchuang@realtek.com
parent 416e87fc

drivers/net/wireless/realtek/rtw88/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ config RTW88_8822B 
config RTW88_8822C

	tristate



config RTW88_8723D

	tristate



config RTW88_8822BE

	tristate "Realtek 8822BE PCI wireless network adapter"

	depends on PCI
@@ -45,10 +48,11 @@ config RTW88_8822CE 
	  802.11ac PCIe wireless network adapter



config RTW88_8723DE

	bool "Realtek 8723DE PCI wireless network adapter"

	tristate "Realtek 8723DE PCI wireless network adapter"

	depends on PCI

	select RTW88_CORE

	select RTW88_PCI

	select RTW88_8723D

	help

	  Select this option will enable support for 8723DE chipset

drivers/net/wireless/realtek/rtw88/Makefile

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

	   regd.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
@@ -32,5 +31,11 @@ rtw88_8822c-objs := rtw8822c.o rtw8822c_table.o 
obj-$(CONFIG_RTW88_8822CE)	+= rtw88_8822ce.o

rtw88_8822ce-objs		:= rtw8822ce.o



obj-$(CONFIG_RTW88_8723D)	+= rtw88_8723d.o

rtw88_8723d-objs		:= rtw8723d.o rtw8723d_table.o



obj-$(CONFIG_RTW88_8723DE)	+= rtw88_8723de.o

rtw88_8723de-objs		:= rtw8723de.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
@@ -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 rtw8723d_hw_spec;



#define RTW_MAX_CHANNEL_NUM_2G 14

#define RTW_MAX_CHANNEL_NUM_5G 49

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_8723DE

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

#endif

	{},

};

MODULE_DEVICE_TABLE(pci, rtw_pci_id_table);

drivers/net/wireless/realtek/rtw88/rtw8723d.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"
@@ -2740,3 +2741,7 @@ struct rtw_chip_info rtw8723d_hw_spec = { 
EXPORT_SYMBOL(rtw8723d_hw_spec);



MODULE_FIRMWARE("rtw88/rtw8723d_fw.bin");



MODULE_AUTHOR("Realtek Corporation");

MODULE_DESCRIPTION("Realtek 802.11n wireless 8723d driver");

MODULE_LICENSE("Dual BSD/GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE