lkml.org 
[lkml]   [2021]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 24/24] wfx: get out from the staging area
    Date
    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 | 1 -
    drivers/staging/Makefile | 1 -
    drivers/staging/wfx/TODO | 6 ------
    8 files changed, 25 insertions(+), 9 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 eeb4c70b3d5b..51993f68379a 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -17099,7 +17099,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 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/Kconfig b/drivers/staging/Kconfig
    index e03627ad4460..666e23a3ce7e 100644
    --- a/drivers/staging/Kconfig
    +++ b/drivers/staging/Kconfig
    @@ -100,6 +100,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 c7f8d8d8dd11..52a0ae1e1a52 100644
    --- a/drivers/staging/Makefile
    +++ b/drivers/staging/Makefile
    @@ -40,4 +40,3 @@ obj-$(CONFIG_SOC_MT7621) += mt7621-dts/
    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/
    -
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-10-05 15:58    [W:2.216 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site