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

Wire up RTL8723DS chipset support using the rtw88 SDIO HCI code as well
as the existing RTL8723D chipset code.

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/20230522202425.1827005-5-martin.blumenstingl@googlemail.com

diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig
index 29eb2f8e0eb79817869ab30e4b8806c20cd37f70..cffad1c012499e0cb28a533dca8f5a9537ce5645 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/Kconfig
+++ b/drivers/net/wireless/realtek/rtw88/Kconfig
@@ -111,6 +111,17 @@ config RTW88_8723DE
 
          802.11n PCIe wireless network adapter
 
+config RTW88_8723DS
+       tristate "Realtek 8723DS SDIO wireless network adapter"
+       depends on MMC
+       select RTW88_CORE
+       select RTW88_SDIO
+       select RTW88_8723D
+       help
+         Select this option will enable support for 8723DS chipset
+
+         802.11n SDIO wireless network adapter
+
 config RTW88_8723DU
        tristate "Realtek 8723DU USB wireless network adapter"
        depends on USB

diff --git a/drivers/net/wireless/realtek/rtw88/Makefile b/drivers/net/wireless/realtek/rtw88/Makefile
index 82979b30ae8dd3a7b0c6901b70e02cfb935d1b0f..fd212c09d88a9ed275a81b25ba7b8f9206f45832 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/Makefile
+++ b/drivers/net/wireless/realtek/rtw88/Makefile
@@ -50,6 +50,9 @@ rtw88_8723d-objs              := rtw8723d.o rtw8723d_table.o
 obj-$(CONFIG_RTW88_8723DE)     += rtw88_8723de.o
 rtw88_8723de-objs              := rtw8723de.o
 
+obj-$(CONFIG_RTW88_8723DS)     += rtw88_8723ds.o
+rtw88_8723ds-objs              := rtw8723ds.o
+
 obj-$(CONFIG_RTW88_8723DU)     += rtw88_8723du.o
 rtw88_8723du-objs              := rtw8723du.o
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
new file mode 100644 (file)
index 0000000..e5b6960
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+/* Copyright(c) Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+ */
+
+#include <linux/mmc/sdio_func.h>
+#include <linux/mmc/sdio_ids.h>
+#include <linux/module.h>
+#include "main.h"
+#include "rtw8723d.h"
+#include "sdio.h"
+
+static const struct sdio_device_id rtw_8723ds_id_table[] =  {
+       {
+               SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
+                           SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT),
+               .driver_data = (kernel_ulong_t)&rtw8723d_hw_spec,
+       },
+       {
+               SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
+                           SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT),
+               .driver_data = (kernel_ulong_t)&rtw8723d_hw_spec,
+       },
+       {}
+};
+MODULE_DEVICE_TABLE(sdio, rtw_8723ds_id_table);
+
+static struct sdio_driver rtw_8723ds_driver = {
+       .name = "rtw_8723ds",
+       .probe = rtw_sdio_probe,
+       .remove = rtw_sdio_remove,
+       .id_table = rtw_8723ds_id_table,
+       .drv = {
+               .pm = &rtw_sdio_pm_ops,
+               .shutdown = rtw_sdio_shutdown,
+       }
+};
+module_sdio_driver(rtw_8723ds_driver);
+
+MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>");
+MODULE_DESCRIPTION("Realtek 802.11n wireless 8723ds driver");
+MODULE_LICENSE("Dual BSD/GPL");