From: Jerome Pouiller <Jerome.Pouiller@silabs.com>
To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Kalle Valo" <kvalo@codeaurora.org>,
"David S . Miller" <davem@davemloft.net>,
devicetree@vger.kernel.org, "Rob Herring" <robh+dt@kernel.org>,
linux-mmc@vger.kernel.org, "Pali Rohár" <pali@kernel.org>,
"Ulf Hansson" <ulf.hansson@linaro.org>,
"Jérôme Pouiller" <jerome.pouiller@silabs.com>
Subject: [PATCH v2 24/24] wfx: get out from the staging area
Date: Tue, 20 Oct 2020 14:58:17 +0200 [thread overview]
Message-ID: <20201020125817.1632995-25-Jerome.Pouiller@silabs.com> (raw)
In-Reply-To: <20201020125817.1632995-1-Jerome.Pouiller@silabs.com>
From: Jérôme Pouiller <jerome.pouiller@silabs.com>
The wfx driver is now mature enough to leave the staging area.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
MAINTAINERS | 3 ++-
drivers/net/wireless/Kconfig | 1 +
drivers/net/wireless/Makefile | 1 +
drivers/net/wireless/silabs/Kconfig | 18 ++++++++++++++++++
drivers/net/wireless/silabs/Makefile | 3 +++
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/wfx/TODO | 6 ------
8 files changed, 25 insertions(+), 10 deletions(-)
create mode 100644 drivers/net/wireless/silabs/Kconfig
create mode 100644 drivers/net/wireless/silabs/Makefile
delete mode 100644 drivers/staging/wfx/TODO
diff --git a/MAINTAINERS b/MAINTAINERS
index b158ec4a5e42..bc5dae823576 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15956,7 +15956,8 @@ F: drivers/platform/x86/touchscreen_dmi.c
SILICON LABS WIRELESS DRIVERS (for WFxxx series)
M: Jérôme Pouiller <jerome.pouiller@silabs.com>
S: Supported
-F: drivers/staging/wfx/
+F: Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
+F: drivers/net/wireless/silabs/wfx/
SILICON MOTION SM712 FRAME BUFFER DRIVER
M: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 170a64e67709..69ea83279907 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -44,6 +44,7 @@ source "drivers/net/wireless/microchip/Kconfig"
source "drivers/net/wireless/ralink/Kconfig"
source "drivers/net/wireless/realtek/Kconfig"
source "drivers/net/wireless/rsi/Kconfig"
+source "drivers/net/wireless/silabs/Kconfig"
source "drivers/net/wireless/st/Kconfig"
source "drivers/net/wireless/ti/Kconfig"
source "drivers/net/wireless/zydas/Kconfig"
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 80b324499786..76885e5f0ea7 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_WLAN_VENDOR_MICROCHIP) += microchip/
obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
+obj-$(CONFIG_WLAN_VENDOR_SILABS) += silabs/
obj-$(CONFIG_WLAN_VENDOR_ST) += st/
obj-$(CONFIG_WLAN_VENDOR_TI) += ti/
obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
diff --git a/drivers/net/wireless/silabs/Kconfig b/drivers/net/wireless/silabs/Kconfig
new file mode 100644
index 000000000000..6262a799bf36
--- /dev/null
+++ b/drivers/net/wireless/silabs/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0
+
+config WLAN_VENDOR_SILABS
+ bool "Silicon Laboratories devices"
+ default y
+ help
+ If you have a wireless card belonging to this class, say Y.
+
+ Note that the answer to this question doesn't directly affect the
+ kernel: saying N will just cause the configurator to skip all the
+ questions about these cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+if WLAN_VENDOR_SILABS
+
+source "drivers/net/wireless/silabs/wfx/Kconfig"
+
+endif # WLAN_VENDOR_SILABS
diff --git a/drivers/net/wireless/silabs/Makefile b/drivers/net/wireless/silabs/Makefile
new file mode 100644
index 000000000000..c2263ee21006
--- /dev/null
+++ b/drivers/net/wireless/silabs/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_WFX) += wfx/
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 2d0310448eba..2d326b16272e 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -114,8 +114,6 @@ source "drivers/staging/kpc2000/Kconfig"
source "drivers/staging/qlge/Kconfig"
-source "drivers/staging/wfx/Kconfig"
-
source "drivers/staging/hikey9xx/Kconfig"
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 757a892ab5b9..9de260802db5 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -47,5 +47,4 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
obj-$(CONFIG_KPC2000) += kpc2000/
obj-$(CONFIG_QLGE) += qlge/
-obj-$(CONFIG_WFX) += wfx/
obj-y += hikey9xx/
diff --git a/drivers/staging/wfx/TODO b/drivers/staging/wfx/TODO
deleted file mode 100644
index 1b4bc2af94b6..000000000000
--- a/drivers/staging/wfx/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a list of things that need to be done to get this driver out of the
-staging directory.
-
- - As suggested by Felix, rate control could be improved following this idea:
- https://lore.kernel.org/lkml/3099559.gv3Q75KnN1@pc-42/
-
--
2.28.0
prev parent reply other threads:[~2020-10-20 13:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 12:57 [PATCH v2 00/24] wfx: get out from the staging area Jerome Pouiller
2020-10-20 12:57 ` [PATCH v2 01/24] mmc: sdio: add SDIO IDs for Silabs WF200 chip Jerome Pouiller
2020-10-20 15:07 ` Ulf Hansson
2020-10-21 22:30 ` Pali Rohár
2020-10-20 12:57 ` [PATCH v2 02/24] dt-bindings: introduce silabs,wfx.yaml Jerome Pouiller
2020-10-26 14:30 ` Rob Herring
2020-10-20 12:57 ` [PATCH v2 03/24] wfx: add Makefile/Kconfig Jerome Pouiller
2020-10-20 12:57 ` [PATCH v2 04/24] wfx: add wfx.h Jerome Pouiller
2020-10-20 12:57 ` [PATCH v2 05/24] wfx: add main.c/main.h Jerome Pouiller
2020-10-20 12:57 ` [PATCH v2 06/24] wfx: add bus.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 07/24] wfx: add bus_spi.c Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 08/24] wfx: add bus_sdio.c Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 09/24] wfx: add hwio.c/hwio.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 10/24] wfx: add fwio.c/fwio.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 11/24] wfx: add bh.c/bh.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 12/24] wfx: add hif_api_*.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 13/24] wfx: add hif_tx*.c/hif_tx*.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 14/24] wfx: add key.c/key.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 15/24] wfx: add hif_rx.c/hif_rx.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 16/24] wfx: add data_rx.c/data_rx.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 17/24] wfx: add queue.c/queue.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 18/24] wfx: add data_tx.c/data_tx.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 19/24] wfx: add sta.c/sta.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 20/24] wfx: add scan.c/scan.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 21/24] wfx: add debug.c/debug.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 22/24] wfx: add traces.h Jerome Pouiller
2020-10-20 12:58 ` [PATCH v2 23/24] wfx: remove from the staging area Jerome Pouiller
2020-10-20 12:58 ` Jerome Pouiller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201020125817.1632995-25-Jerome.Pouiller@silabs.com \
--to=jerome.pouiller@silabs.com \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pali@kernel.org \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).