From patchwork Wed Nov 4 15:52:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 318461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1CA2C388F9 for ; Wed, 4 Nov 2020 15:54:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 75C4D22280 for ; Wed, 4 Nov 2020 15:54:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="eueQG5Ow" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731302AbgKDPy1 (ORCPT ); Wed, 4 Nov 2020 10:54:27 -0500 Received: from mail-dm6nam11on2049.outbound.protection.outlook.com ([40.107.223.49]:54240 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731266AbgKDPyP (ORCPT ); Wed, 4 Nov 2020 10:54:15 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UvWD87n1MVPYCX6+xsct9j516n3xQVHnXClT5uwG3vhu/wG4ghdOH6zMoBA4CC/8gm7nFFqn4pJWj0YtjzQakWSbOZW/Hq3uzX2JozjF5nWIobCKJj/ykc+oRoqYUS+Wgh3EBA5EqPuLmyrvBDHm+Pgq5IfV1qjOaFOAxk3DUtd9pnxyThJ6tiv6LBx1t5fv84abU9T0X7II+s4DrxKkYQdnlL53jT3p7e9CMBmEWPUSuWsPLs+ylHJ9RA4E7tV/BRdUI7AlXfgQ0J1X0/IbrtCpp9eLb8J4YaTMkd/IrGBlokibaNUURN30W+kd+Ti55GLYZYq0Pvb2HjOyyuSGKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QHkeHzcJ6PVGT+kLjG4uoiPAi3jxgyaFA7pQqVd8RkQ=; b=nF5TPsZIaby6ivBlou+wZMQ8LoIHpuXfYsNszBHSGHntHfRew99BgTe51W6E92zotpWTwTi+GBce5SdSYntoN89U0cKL5jCYd4LXVoi+8q3M6utkrvpdKo2c7WVQRzUcT6ZZreQhGMClQxVs5AmpLbbNTyL8yIAp0r5gVA7hq8LuGVpMqCqjCZtoIdhBYqaVdyaqpySYHwLtZCAhWXj/YcqO0Ov+k/CoaRYzB4nWPapsp98FzjUvMKBfZO/p9kVW+CYuz65ABIujXvBliTiJANTzkIL8XUxMCioFmSEndLHrS7RNt7S0JGki6PHIkd0bN89xitvjpEiiLgqdqolEBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QHkeHzcJ6PVGT+kLjG4uoiPAi3jxgyaFA7pQqVd8RkQ=; b=eueQG5OwkveQix5ZJoUnTugYh7U3RxqAF0+58Us6AKGMvdehzpnC7yc3qJwAVxi36s+r185EEQYYcU2cAJ5GfdNaDQCxZK6XXdRE9vF9eQineAX8F3TdJ6jUJ53X/l7B4QSIr0J0hl86pYxz38ljEZtFadEeD1XA9jJH63W1eQY= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.32; Wed, 4 Nov 2020 15:53:16 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::4f5:fbe5:44a7:cb8a%5]) with mapi id 15.20.3499.032; Wed, 4 Nov 2020 15:53:16 +0000 From: Jerome Pouiller To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , devicetree@vger.kernel.org, Rob Herring , linux-mmc@vger.kernel.org, =?utf-8?q?Pali_Roh=C3=A1r?= , Ulf Hansson , =?utf-8?b?SsOpcsO0bWUg?= =?utf-8?q?Pouiller?= Subject: [PATCH v3 24/24] wfx: get out from the staging area Date: Wed, 4 Nov 2020 16:52:07 +0100 Message-Id: <20201104155207.128076-25-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201104155207.128076-1-Jerome.Pouiller@silabs.com> References: <20201104155207.128076-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: SN6PR01CA0032.prod.exchangelabs.com (2603:10b6:805:b6::45) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (82.67.86.106) by SN6PR01CA0032.prod.exchangelabs.com (2603:10b6:805:b6::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Wed, 4 Nov 2020 15:53:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e731604c-1baa-45be-e81e-08d880d9be57 X-MS-TrafficTypeDiagnostic: SN6PR11MB2718: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xTDyyUfo+WXsbLt3d58yNdlesSOF2CXdUvGmgmk2n01yMZL0qyHlvwjk5ghIIdVKStlhuyn1UilxOpezechhT0r5VsFGhPS2ryRQFmczyoPJdKCJ0evv1OsRTM+kLEboVXQYvG+SaEF1pIhFuQiQpJUvokqVK4OIIbhem+J4kUwVD76gqH/NawOPMe2iXWfTkEjKUZuLDyZsDV3kc5MgVU/zvEZJhsubNyV/Swan0oUoCVqAcbjTflqEEsPt4Cj6NfDGL7QROPXpPxHalu4FSP3n9ypcURxskjeRJekgZ/rltbuSRtG2vgzJZx7y3Z1J6ugugKXxDtYHCVbSEahmgORFdFscpeABq7Vthfw+sCtqsqX1g+nvsrj4HPbly+Nj5m9Ywhyn+LinoFB4GVyoxA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB2718.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(346002)(376002)(39850400004)(136003)(396003)(8936002)(966005)(478600001)(186003)(16526019)(956004)(2616005)(6486002)(8676002)(66574015)(66476007)(66556008)(66946007)(316002)(7696005)(6666004)(83380400001)(26005)(54906003)(107886003)(36756003)(52116002)(7416002)(4326008)(5660300002)(86362001)(1076003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: fI2rH/vACQ3E8y8ZinqfCULlwm3NqXKJ7L1viKzReUUOru50ZKJ7a7ZSymKZLMBjVP1N+oQNBwhFqJzQdNXAHrypGmlXDY0Mr7s8gsF4ydmEtYcv5qBP5c9yf7I+5ZvAxemRE5xQ5xGppbMv2xTJVFjRG9OrIp1UZb7l3vyjIFa5vT5ejqzUsR/mD094WeFxEQSJ9FvlT2rj1PQg2ch3UOgxJwFxKPab98hm1iqHRRO2ktvj5k29yPq07qg9R8oJbAuShRBG1vm1gaxtAmRoeIjQJDIYP/6UeFW0iCSkySMhM131XiInoW3gGufQxZQMDSzgo43qTMVTSI1ON9Au9l7hkrW1ZtWUAaaB8GN1I6XQ6vbixm4hdLc7RLk0melTFvp8OHpyAoY6vW5alsYpMu71rHhoGDhwWy14MjJKTKTDmy1QH4+ug9DCx0dcrAf1eNJ+lF19fcyUFoKZ6seKR6x6vSbssxBlqIB8y4+DP9VKfqjSPmR9lI/09/8DIR0mLhBBd/K5eZKrADPp3MfmzzY7iiwz8i3eUE5R/SfMHWL1qT2pzHPaAYcUqZJlG2xemRcVS466kKqRnKTDnfFwze5fBd4yMW1gE3M3IW5ODuUkzXkAXgSbkPidDkCMMdaTfguYLivcN3JkzDgrKWpqOQ== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: e731604c-1baa-45be-e81e-08d880d9be57 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2020 15:53:16.5084 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dbT+TmTyU67nq44d+ZoK7rNpWVaPbKCKM+CikG7Zy4Ppbvc6A9+3nYqT+erI3rbMtaTWtf2j3aDMN2VU+y5gxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2718 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The wfx driver is now mature enough to leave the staging area. Signed-off-by: Jérôme Pouiller --- 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 6d4b80de1406..4bf9c4170d33 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15946,7 +15946,8 @@ F: drivers/platform/x86/touchscreen_dmi.c SILICON LABS WIRELESS DRIVERS (for WFxxx series) M: Jérôme Pouiller 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 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 443ca3f3cdf0..436363affea9 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -116,8 +116,6 @@ source "drivers/staging/qlge/Kconfig" source "drivers/staging/wimax/Kconfig" -source "drivers/staging/wfx/Kconfig" - source "drivers/staging/hikey9xx/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index dc45128ef525..cbfd0524755a 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -48,5 +48,4 @@ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_KPC2000) += kpc2000/ obj-$(CONFIG_QLGE) += qlge/ obj-$(CONFIG_WIMAX) += wimax/ -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/ -