wifi: rtw88: Add support for the SDIO based RTL8822BS chipset

Wire up RTL8822BS chipset support using the new rtw88 SDIO HCI code as
well as the existing RTL8822B chipset code.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230405200729.632435-8-martin.blumenstingl@googlemail.com

diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig
index cdf9cb478ee2aa108ec622b6608cb47de35f0df7..0cfc68dcc4167e9a7a7bd586bfff18a7cbe3a41f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/Kconfig
+++ b/drivers/net/wireless/realtek/rtw88/Kconfig
@@ -45,6 +45,17 @@ config RTW88_8822BE
 
          802.11ac PCIe wireless network adapter
 
+config RTW88_8822BS
+       tristate "Realtek 8822BS SDIO wireless network adapter"
+       depends on MMC
+       select RTW88_CORE
+       select RTW88_SDIO
+       select RTW88_8822B
+       help
+         Select this option will enable support for 8822BS chipset
+
+         802.11ac SDIO wireless network adapter
+
 config RTW88_8822BU
        tristate "Realtek 8822BU USB wireless network adapter"
        depends on USB

diff --git a/drivers/net/wireless/realtek/rtw88/Makefile b/drivers/net/wireless/realtek/rtw88/Makefile
index 892cad60ba31de38c28b7fce1724bf85806e1edb..2b8f4dd9707f120911cb9d2cf9c474b0137afe68 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/Makefile
+++ b/drivers/net/wireless/realtek/rtw88/Makefile
@@ -26,6 +26,9 @@ rtw88_8822b-objs              := rtw8822b.o rtw8822b_table.o
 obj-$(CONFIG_RTW88_8822BE)     += rtw88_8822be.o
 rtw88_8822be-objs              := rtw8822be.o
 
+obj-$(CONFIG_RTW88_8822BS)     += rtw88_8822bs.o
+rtw88_8822bs-objs              := rtw8822bs.o
+
 obj-$(CONFIG_RTW88_8822BU)     += rtw88_8822bu.o
 rtw88_8822bu-objs              := rtw8822bu.o
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
new file mode 100644 (file)
index 0000000..31d8645
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+/* Copyright(c) Jernej Skrabec <jernej.skrabec@gmail.com>
+ */
+
+#include <linux/mmc/sdio_func.h>
+#include <linux/mmc/sdio_ids.h>
+#include <linux/module.h>
+#include "main.h"
+#include "rtw8822b.h"
+#include "sdio.h"
+
+static const struct sdio_device_id rtw_8822bs_id_table[] =  {
+       {
+               SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
+                           SDIO_DEVICE_ID_REALTEK_RTW8822BS),
+               .driver_data = (kernel_ulong_t)&rtw8822b_hw_spec,
+       },
+       {}
+};
+MODULE_DEVICE_TABLE(sdio, rtw_8822bs_id_table);
+
+static struct sdio_driver rtw_8822bs_driver = {
+       .name = "rtw_8822bs",
+       .probe = rtw_sdio_probe,
+       .remove = rtw_sdio_remove,
+       .id_table = rtw_8822bs_id_table,
+       .drv = {
+               .pm = &rtw_sdio_pm_ops,
+               .shutdown = rtw_sdio_shutdown,
+       }
+};
+module_sdio_driver(rtw_8822bs_driver);
+
+MODULE_AUTHOR("Jernej Skrabec <jernej.skrabec@gmail.com>");
+MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822bs driver");
+MODULE_LICENSE("Dual BSD/GPL");