From patchwork Wed Dec 23 15:39:25 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: 351655 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 2B67EC43333 for ; Wed, 23 Dec 2020 15:42:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED3FE233CF for ; Wed, 23 Dec 2020 15:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728625AbgLWPlw (ORCPT ); Wed, 23 Dec 2020 10:41:52 -0500 Received: from mail-bn8nam08on2089.outbound.protection.outlook.com ([40.107.100.89]:24001 "EHLO NAM04-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729218AbgLWPlo (ORCPT ); Wed, 23 Dec 2020 10:41:44 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jb5unaxYpVJoAWIDZujqMCUXh3/I2LFFCbO7/0uBvS+MuMgRgqCVJrwc/9v6YlD/stsUOXvMqu0wQaoPcuTossBEsjsGFVCnpCS37Smbq9MbSpl3EfM3ubh7Lxc8yhFPqNvovwMg6WMctZE6e+aFdMTti7RU+ONM1YGdaxJfAfNteWZ7pq/Ilbdp73lqzvOavVGT/uTUGeCYt+11JJd+fDRc8QPYN9LRQLAGiMXpjnHSCsK/OyMei+d1we9hnsXz6AfhMBuOnAXA0CHXLtHL9YTjyNuoGEV2wugs/Sisnz3sGiCS5ZRy3pPIuHH2Q0SiJL02c/BkkGutVr08dxnf+w== 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=PMPoZ8e8XcnIpeJ5w6rBJi1gpq16UR6xeMDyqo5yyuA=; b=FLfAIbBLX6ZXWtBDX5l3VxndShU4uzj+W0/54QP6nG6nE4vUgUmZHnlU885PhyU0NfxS88RUPO4rdawQOsXiHjZR8rT3NNkGlUzWXkzC2yBAhVzvl+JdY7z8zs8wsURfoaQHz9OO3jk9QRgkCezSJ5i89ViPjUp7sTWvw+ajLpf3QqmAwRxcZIRKmHLGD9M4p8sQoHqnHG1boV6yZJnkIZBR5jgYlXCypHI3foNJ9AzkbIqrINvN+Jf90+s5F2VuTfHmRm7UH49seirfcaL9fGr+gO5klINWh6zXjTqjQZl6wFLemEF1Ik4mY0MkNpc2KyBDAGGoLV5nNvQnTtAnpg== 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=PMPoZ8e8XcnIpeJ5w6rBJi1gpq16UR6xeMDyqo5yyuA=; b=SfCBQH0y6DU5XRZ2NRhZmaUw94G3dvXuRbXov0RqSBZNayfi3jzK5Hg79BgtXQM/hU9hjYF6FYE9VeHMyv9SQatWdppXua2KM0PiwroOCdpZ5WH2uVFwjPl8C3FPz2zrVq5ftFaxnv7sKAQIcHkNORCf2zkeoKYtx/AcL1ZDDIM= 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 SA0PR11MB4543.namprd11.prod.outlook.com (2603:10b6:806:99::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.29; Wed, 23 Dec 2020 15:40:37 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::a989:f850:6736:97ca]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::a989:f850:6736:97ca%5]) with mapi id 15.20.3700.026; Wed, 23 Dec 2020 15:40:37 +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 v4 24/24] wfx: get out from the staging area Date: Wed, 23 Dec 2020 16:39:25 +0100 Message-Id: <20201223153925.73742-25-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201223153925.73742-1-Jerome.Pouiller@silabs.com> References: <20201223153925.73742-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: SA0PR12CA0024.namprd12.prod.outlook.com (2603:10b6:806:6f::29) 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 SA0PR12CA0024.namprd12.prod.outlook.com (2603:10b6:806:6f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3700.27 via Frontend Transport; Wed, 23 Dec 2020 15:40:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 430d5c5b-077e-4346-c645-08d8a759186b X-MS-TrafficTypeDiagnostic: SA0PR11MB4543: 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: lEnB6cH22SG9rW9K8WZ1YwHj76dUKtge4mctfLhOkyOv0l1vE2ntNE2IH+1O5+VTqoZ2Los/Otzc3e9TDIcx3c2bYrHr0NRIGJ2yeAlDsCYCYFrt8yyllGnEuIXPubcJKjTZnCUrsbr5T+vxSfSypHScrCLQQ1IyI716oTY6PNmwxVP3UpS4RsAqF65nzWSvxNLZtBa0QuiQsmBYd1JTHJmPSDeM+BST/rNCfEoFiX4hbJVLuRYg5RXEl8IUISz19asv+CpqyMChnklwxggDgXSPHJJrn+R8EDWWRWgl/LYz5hEmd+h5eSjrDK59X3xoaYKuERHDsZ2bNlTlydZdI8zmD0L2mHAevEMnHhZLocEJgmibNs6ODDT7MB/ev0PCju5G/C1NaTsGdN6d4vh5VpHmy2hj+vPUV4dOEONZuuMqZKoS2WZuL4gRnx1QzTJiNIXAsmrVm2MDpO/RoMt83A== 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:(136003)(376002)(366004)(346002)(396003)(39850400004)(5660300002)(956004)(2616005)(66476007)(66556008)(86362001)(36756003)(107886003)(66574015)(66946007)(6486002)(4326008)(83380400001)(966005)(6666004)(8676002)(186003)(52116002)(16526019)(7416002)(478600001)(26005)(1076003)(316002)(7696005)(54906003)(8936002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?RwIXcefEm4KgYLzrEnvxcIvJ42h?= =?utf-8?q?mYMgdMi5F63NGcJx6k08GrB8J/BxuzxuBqmgiQrP/QDgBjW5lFdqd/Z0?= =?utf-8?q?w3ZnJx8YlEGHQliC+pB4wLJxWt1cQ2dIWP7gvv5/0z5xtuuuIanfrWnZ?= =?utf-8?q?9rSlvJMmqH6XxuNw6kwy0mtQ5bLWgJhEfem78QQP5BqepTs93H8fVEJT?= =?utf-8?q?tTDvwNDGWwLzVZGygKKLc8EqRQ7CQTYSlMH+JWWYybf6+NNvHZKMCsF7?= =?utf-8?q?BOkNJE+xfnbZMVEABAOjTAOjBvdwci9RJyBJzk7EIilaxSx7/6ZBbXKJ?= =?utf-8?q?aD3Sssy/KaGupmTZvl6vmYf3Cv/6sOsFugsrLPYUjMRkc7tXpzKmRekD?= =?utf-8?q?iElnh8JT/DDqFXWM0QYzo+sksgXa2xSw9wrkStYn8DtQGA76EfnK1E0G?= =?utf-8?q?7OlwzRtiqMy+Q3NDYvq3S0/4PAGoul+h1ylrS/o8z/3Jd47uIpDBwMk9?= =?utf-8?q?buLtHFvEZSLq+33okx2gQrTp0VyQm0m2QtYw0zWprlIfsEO7xxf3AIz7?= =?utf-8?q?fvqkgLJDOAKvWVztRg9KXbUpR/kI23NscuvMwn/j2tcONgYWJBh7X/dt?= =?utf-8?q?mqtLfgeJotEoM44cd0NlGgsYWIJX1pgN3l40PhsPgTGt6cNbEYCs1Azw?= =?utf-8?q?Dme3fXejNgklW3UQQlL0qH2rSh6hW2f3FDG+8RSPrpy0jenaTvjPaeJN?= =?utf-8?q?FNFHTyDPCwvtAKS8N2E6+Pa+N4Irxchw8MyrGcasA8mZS1YW4HX1Sn5n?= =?utf-8?q?BY6/G6yJPcuKrGlOYe6vBGGBwwTKd82QH8cAc6taY6JCjHt3/NbUIusg?= =?utf-8?q?PCMbk5zUUcOXhd6pSPx1sOzh3lQuyGMzxTHQnuXC3ICssj5KgyRhw3GI?= =?utf-8?q?AiWxiFr/P7LMx1vuOJRP6kuLD61mq58fT3ZSoS/7WDt9CwvZU6p0QDyN?= =?utf-8?q?Hpb+vRhs2/mfdLQ6r9Z5Ag/jy6UhZPFxf4LWAsATZqI/qnQRboIlRMhc?= =?utf-8?q?2mMBdsM/wUPQgGpCZqZygmXKpFbNj/fiClIBGmccMVj3S?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2020 15:40:37.5030 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-Network-Message-Id: 430d5c5b-077e-4346-c645-08d8a759186b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BCuniCxFEaI+KwV6lGfuqtoUUpOhIlQylogLJOSsj1MeMhKCGMbvztlEZnpn1pdWWXRX3Wkr5Wa8r2hEV4TpIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4543 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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 9d7784a5cb88..35810219bad0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16219,7 +16219,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 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 b22f73d7bfc4..b07de39b9f0a 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -110,8 +110,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 2245059e69c7..c6a992d1edd5 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -45,5 +45,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/ -