diff options
author | Kalle Valo <kvalo@kernel.org> | 2022-04-12 17:31:44 +0300 |
---|---|---|
committer | Kalle Valo <kvalo@kernel.org> | 2022-04-12 17:31:44 +0300 |
commit | 79649041edc8323ba7c159e5c7e2d2d55aaa9733 (patch) | |
tree | d20c2f7ce371fc54cb52177742dfd2b399c03061 /drivers | |
parent | 780d9c48a05a2945912a9f7e0f511c8024e38f40 (diff) | |
parent | 4a5fb1bbcdf1cccae1f6b9c0277b3796b2a468ef (diff) | |
download | linux-79649041edc8323ba7c159e5c7e2d2d55aaa9733.tar.bz2 |
Merge branch 'wfx-move-out-of-staging'
This is an immutable branch shared between wireless-next and
staging-next for moving wfx driver out of staging to
drivers/net/wireless directory.
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/wireless/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/Kconfig | 18 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/Makefile | 3 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/Kconfig (renamed from drivers/staging/wfx/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/Makefile (renamed from drivers/staging/wfx/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/bh.c (renamed from drivers/staging/wfx/bh.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/bh.h (renamed from drivers/staging/wfx/bh.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/bus.h (renamed from drivers/staging/wfx/bus.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/bus_sdio.c (renamed from drivers/staging/wfx/bus_sdio.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/bus_spi.c (renamed from drivers/staging/wfx/bus_spi.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/data_rx.c (renamed from drivers/staging/wfx/data_rx.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/data_rx.h (renamed from drivers/staging/wfx/data_rx.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/data_tx.c (renamed from drivers/staging/wfx/data_tx.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/data_tx.h (renamed from drivers/staging/wfx/data_tx.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/debug.c (renamed from drivers/staging/wfx/debug.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/debug.h (renamed from drivers/staging/wfx/debug.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/fwio.c (renamed from drivers/staging/wfx/fwio.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/fwio.h (renamed from drivers/staging/wfx/fwio.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_api_cmd.h (renamed from drivers/staging/wfx/hif_api_cmd.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_api_general.h (renamed from drivers/staging/wfx/hif_api_general.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_api_mib.h (renamed from drivers/staging/wfx/hif_api_mib.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_rx.c (renamed from drivers/staging/wfx/hif_rx.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_rx.h (renamed from drivers/staging/wfx/hif_rx.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_tx.c (renamed from drivers/staging/wfx/hif_tx.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_tx.h (renamed from drivers/staging/wfx/hif_tx.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_tx_mib.c (renamed from drivers/staging/wfx/hif_tx_mib.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hif_tx_mib.h (renamed from drivers/staging/wfx/hif_tx_mib.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hwio.c (renamed from drivers/staging/wfx/hwio.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/hwio.h (renamed from drivers/staging/wfx/hwio.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/key.c (renamed from drivers/staging/wfx/key.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/key.h (renamed from drivers/staging/wfx/key.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/main.c (renamed from drivers/staging/wfx/main.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/main.h (renamed from drivers/staging/wfx/main.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/queue.c (renamed from drivers/staging/wfx/queue.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/queue.h (renamed from drivers/staging/wfx/queue.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/scan.c (renamed from drivers/staging/wfx/scan.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/scan.h (renamed from drivers/staging/wfx/scan.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/sta.c (renamed from drivers/staging/wfx/sta.c) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/sta.h (renamed from drivers/staging/wfx/sta.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/traces.h (renamed from drivers/staging/wfx/traces.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/silabs/wfx/wfx.h (renamed from drivers/staging/wfx/wfx.h) | 0 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/wfx/TODO | 6 |
45 files changed, 23 insertions, 8 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 7add2002ff4c..e78ff7af6517 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -31,6 +31,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/wfx/Kconfig b/drivers/net/wireless/silabs/wfx/Kconfig index 835a855409d8..835a855409d8 100644 --- a/drivers/staging/wfx/Kconfig +++ b/drivers/net/wireless/silabs/wfx/Kconfig diff --git a/drivers/staging/wfx/Makefile b/drivers/net/wireless/silabs/wfx/Makefile index c8b356f71c99..c8b356f71c99 100644 --- a/drivers/staging/wfx/Makefile +++ b/drivers/net/wireless/silabs/wfx/Makefile diff --git a/drivers/staging/wfx/bh.c b/drivers/net/wireless/silabs/wfx/bh.c index bcea9d5b119c..bcea9d5b119c 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/net/wireless/silabs/wfx/bh.c diff --git a/drivers/staging/wfx/bh.h b/drivers/net/wireless/silabs/wfx/bh.h index a44c8b421b7c..a44c8b421b7c 100644 --- a/drivers/staging/wfx/bh.h +++ b/drivers/net/wireless/silabs/wfx/bh.h diff --git a/drivers/staging/wfx/bus.h b/drivers/net/wireless/silabs/wfx/bus.h index ccadfdd6873c..ccadfdd6873c 100644 --- a/drivers/staging/wfx/bus.h +++ b/drivers/net/wireless/silabs/wfx/bus.h diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/net/wireless/silabs/wfx/bus_sdio.c index 51a0d58a9070..51a0d58a9070 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/net/wireless/silabs/wfx/bus_sdio.c diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/net/wireless/silabs/wfx/bus_spi.c index 7fb1afb8ed31..7fb1afb8ed31 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/net/wireless/silabs/wfx/bus_spi.c diff --git a/drivers/staging/wfx/data_rx.c b/drivers/net/wireless/silabs/wfx/data_rx.c index a4b5ffe158e4..a4b5ffe158e4 100644 --- a/drivers/staging/wfx/data_rx.c +++ b/drivers/net/wireless/silabs/wfx/data_rx.c diff --git a/drivers/staging/wfx/data_rx.h b/drivers/net/wireless/silabs/wfx/data_rx.h index cf708f16d602..cf708f16d602 100644 --- a/drivers/staging/wfx/data_rx.h +++ b/drivers/net/wireless/silabs/wfx/data_rx.h diff --git a/drivers/staging/wfx/data_tx.c b/drivers/net/wireless/silabs/wfx/data_tx.c index e07381b2ff4d..e07381b2ff4d 100644 --- a/drivers/staging/wfx/data_tx.c +++ b/drivers/net/wireless/silabs/wfx/data_tx.c diff --git a/drivers/staging/wfx/data_tx.h b/drivers/net/wireless/silabs/wfx/data_tx.h index 983470705e4b..983470705e4b 100644 --- a/drivers/staging/wfx/data_tx.h +++ b/drivers/net/wireless/silabs/wfx/data_tx.h diff --git a/drivers/staging/wfx/debug.c b/drivers/net/wireless/silabs/wfx/debug.c index e8265208f9a5..e8265208f9a5 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/net/wireless/silabs/wfx/debug.c diff --git a/drivers/staging/wfx/debug.h b/drivers/net/wireless/silabs/wfx/debug.h index 3840575e5e28..3840575e5e28 100644 --- a/drivers/staging/wfx/debug.h +++ b/drivers/net/wireless/silabs/wfx/debug.h diff --git a/drivers/staging/wfx/fwio.c b/drivers/net/wireless/silabs/wfx/fwio.c index 3d1b8a135dc0..3d1b8a135dc0 100644 --- a/drivers/staging/wfx/fwio.c +++ b/drivers/net/wireless/silabs/wfx/fwio.c diff --git a/drivers/staging/wfx/fwio.h b/drivers/net/wireless/silabs/wfx/fwio.h index eeea61210eca..eeea61210eca 100644 --- a/drivers/staging/wfx/fwio.h +++ b/drivers/net/wireless/silabs/wfx/fwio.h diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/net/wireless/silabs/wfx/hif_api_cmd.h index 8b91b1d4a46b..8b91b1d4a46b 100644 --- a/drivers/staging/wfx/hif_api_cmd.h +++ b/drivers/net/wireless/silabs/wfx/hif_api_cmd.h diff --git a/drivers/staging/wfx/hif_api_general.h b/drivers/net/wireless/silabs/wfx/hif_api_general.h index 4d400fdc2252..4d400fdc2252 100644 --- a/drivers/staging/wfx/hif_api_general.h +++ b/drivers/net/wireless/silabs/wfx/hif_api_general.h diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/net/wireless/silabs/wfx/hif_api_mib.h index 7b68b83866c9..7b68b83866c9 100644 --- a/drivers/staging/wfx/hif_api_mib.h +++ b/drivers/net/wireless/silabs/wfx/hif_api_mib.h diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/net/wireless/silabs/wfx/hif_rx.c index 64ca8acb8e4f..64ca8acb8e4f 100644 --- a/drivers/staging/wfx/hif_rx.c +++ b/drivers/net/wireless/silabs/wfx/hif_rx.c diff --git a/drivers/staging/wfx/hif_rx.h b/drivers/net/wireless/silabs/wfx/hif_rx.h index 96543b81fa77..96543b81fa77 100644 --- a/drivers/staging/wfx/hif_rx.h +++ b/drivers/net/wireless/silabs/wfx/hif_rx.h diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/net/wireless/silabs/wfx/hif_tx.c index ae3cc5919dcd..ae3cc5919dcd 100644 --- a/drivers/staging/wfx/hif_tx.c +++ b/drivers/net/wireless/silabs/wfx/hif_tx.c diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/net/wireless/silabs/wfx/hif_tx.h index 71817a6571f0..71817a6571f0 100644 --- a/drivers/staging/wfx/hif_tx.h +++ b/drivers/net/wireless/silabs/wfx/hif_tx.h diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/net/wireless/silabs/wfx/hif_tx_mib.c index df1bcb1e2c02..df1bcb1e2c02 100644 --- a/drivers/staging/wfx/hif_tx_mib.c +++ b/drivers/net/wireless/silabs/wfx/hif_tx_mib.c diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/net/wireless/silabs/wfx/hif_tx_mib.h index bcd4ef6a8497..bcd4ef6a8497 100644 --- a/drivers/staging/wfx/hif_tx_mib.h +++ b/drivers/net/wireless/silabs/wfx/hif_tx_mib.h diff --git a/drivers/staging/wfx/hwio.c b/drivers/net/wireless/silabs/wfx/hwio.c index 3f9750b470be..3f9750b470be 100644 --- a/drivers/staging/wfx/hwio.c +++ b/drivers/net/wireless/silabs/wfx/hwio.c diff --git a/drivers/staging/wfx/hwio.h b/drivers/net/wireless/silabs/wfx/hwio.h index c6e7b065b7ff..c6e7b065b7ff 100644 --- a/drivers/staging/wfx/hwio.h +++ b/drivers/net/wireless/silabs/wfx/hwio.h diff --git a/drivers/staging/wfx/key.c b/drivers/net/wireless/silabs/wfx/key.c index 8f23e8d42bd4..8f23e8d42bd4 100644 --- a/drivers/staging/wfx/key.c +++ b/drivers/net/wireless/silabs/wfx/key.c diff --git a/drivers/staging/wfx/key.h b/drivers/net/wireless/silabs/wfx/key.h index 2234e36dbbcd..2234e36dbbcd 100644 --- a/drivers/staging/wfx/key.h +++ b/drivers/net/wireless/silabs/wfx/key.h diff --git a/drivers/staging/wfx/main.c b/drivers/net/wireless/silabs/wfx/main.c index b93b16b900c8..b93b16b900c8 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/net/wireless/silabs/wfx/main.c diff --git a/drivers/staging/wfx/main.h b/drivers/net/wireless/silabs/wfx/main.h index 68c665307153..68c665307153 100644 --- a/drivers/staging/wfx/main.h +++ b/drivers/net/wireless/silabs/wfx/main.h diff --git a/drivers/staging/wfx/queue.c b/drivers/net/wireless/silabs/wfx/queue.c index 729825230db2..729825230db2 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/net/wireless/silabs/wfx/queue.c diff --git a/drivers/staging/wfx/queue.h b/drivers/net/wireless/silabs/wfx/queue.h index 4731debca93d..4731debca93d 100644 --- a/drivers/staging/wfx/queue.h +++ b/drivers/net/wireless/silabs/wfx/queue.h diff --git a/drivers/staging/wfx/scan.c b/drivers/net/wireless/silabs/wfx/scan.c index 7f34f0d322f9..7f34f0d322f9 100644 --- a/drivers/staging/wfx/scan.c +++ b/drivers/net/wireless/silabs/wfx/scan.c diff --git a/drivers/staging/wfx/scan.h b/drivers/net/wireless/silabs/wfx/scan.h index 78e3b984f375..78e3b984f375 100644 --- a/drivers/staging/wfx/scan.h +++ b/drivers/net/wireless/silabs/wfx/scan.h diff --git a/drivers/staging/wfx/sta.c b/drivers/net/wireless/silabs/wfx/sta.c index 3297d73c327a..3297d73c327a 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/net/wireless/silabs/wfx/sta.c diff --git a/drivers/staging/wfx/sta.h b/drivers/net/wireless/silabs/wfx/sta.h index c69b2227e9ac..c69b2227e9ac 100644 --- a/drivers/staging/wfx/sta.h +++ b/drivers/net/wireless/silabs/wfx/sta.h diff --git a/drivers/staging/wfx/traces.h b/drivers/net/wireless/silabs/wfx/traces.h index e011e8a46bd5..e011e8a46bd5 100644 --- a/drivers/staging/wfx/traces.h +++ b/drivers/net/wireless/silabs/wfx/traces.h diff --git a/drivers/staging/wfx/wfx.h b/drivers/net/wireless/silabs/wfx/wfx.h index 6594cc647c2f..6594cc647c2f 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/net/wireless/silabs/wfx/wfx.h diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 932acb4e8cbc..fc274737053d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -86,6 +86,5 @@ source "drivers/staging/fieldbus/Kconfig" source "drivers/staging/qlge/Kconfig" -source "drivers/staging/wfx/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 3ffb35ccfae2..65e317922e3f 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -33,4 +33,3 @@ obj-$(CONFIG_PI433) += pi433/ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_QLGE) += qlge/ -obj-$(CONFIG_WFX) += wfx/ 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/ - |