From patchwork Mon Oct 12 10:46:48 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: 270081 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 059D7C433E7 for ; Mon, 12 Oct 2020 10:49:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90BE7206B6 for ; Mon, 12 Oct 2020 10:49:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="i928r0XH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388184AbgJLKtk (ORCPT ); Mon, 12 Oct 2020 06:49:40 -0400 Received: from mail-dm6nam11on2077.outbound.protection.outlook.com ([40.107.223.77]:59904 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388070AbgJLKtW (ORCPT ); Mon, 12 Oct 2020 06:49:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ARsIc1PD/Kup7vFBtZ0DNzvo9Cpj5gzYGOTxGRL5zwO7AHwEHLxJGCRw1nz7AMGkbz8ayhDoWrMP84Nsei1ZrwfwPzlloCdMclarLvHly0Q5/eLN2BvLOhnQlPtHcwA7+slsSLfT0cJMwkE4FUDoPhWhqjxybk/XQ7FzXrjVzsm8Mz8fgMdTiDLEzTpzbG1cX1a7BuB6iESh8GabqoXSrl84SR4FtdwO/Z10YwJHUJlAloOixgHZkew4jkzir8E5wCepUr3s4bqvCREBfege2zmmnNtcqYELUUROmokoXYpfYnZ3gLK8Qr7vaLETWZhpL3BYoVCS9Okdw7kJZYQj9A== 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=uBLvox2iXc57mCna1AZj9BmpOZQma4jp92Hg5KojRBg=; b=KtBjX586DCYeKZxFtAqqLUo+ltpCKxINY6+NL7mmjeRTWfp3712+RO9QzMLFSgAHwwhfPHsYHpo6LM36WlYkEbAdE8qStK+XxlGUS29qF8L1j4WGdqZtamB/mlfMQfjDEaRemiSg2v4wEEGDr2L95OyMptaXbBCKa7uw+QQZgqEpVQ1+diCbZCdTlBT3THYNVI3z8o4HXsMFBEkPil5i40Ns8Poa4JGXvt/OwnizyiR/HyLSAtTtuAby4HqnoJvKyySRfI5DiJDT4Us76AQQKk7lVnT1W2WtA+r+Wddwq6GQkp0Kq2LoqDNRFBJIb7Qe6rF9PQKmHh+N188Dx4BWcQ== 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=uBLvox2iXc57mCna1AZj9BmpOZQma4jp92Hg5KojRBg=; b=i928r0XHkqqxT+CHKo/aMg8XgwG3Nq14VLKO+RPJomrmH0mDEBMOLSjjPhVDHfBlLHmiA13wjoq63OI7acB88afgMsPq7YQw8MdQMlkNumukQkDK4eHiVJe0QGmb/Qf/XKuuh5MeVO1ZM6wLW1K9uRaTS1uFIlsSkVdneq6/i5U= 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 SA0PR11MB4734.namprd11.prod.outlook.com (2603:10b6:806:99::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Mon, 12 Oct 2020 10:47:49 +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.3455.029; Mon, 12 Oct 2020 10:47:49 +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 , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 23/23] wfx: get out from the staging area Date: Mon, 12 Oct 2020 12:46:48 +0200 Message-Id: <20201012104648.985256-24-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012104648.985256-1-Jerome.Pouiller@silabs.com> References: <20201012104648.985256-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [82.67.86.106] X-ClientProxiedBy: PR3P189CA0005.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::10) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.home (82.67.86.106) by PR3P189CA0005.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Mon, 12 Oct 2020 10:47:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93c23425-7e99-4a50-13a9-08d86e9c430d X-MS-TrafficTypeDiagnostic: SA0PR11MB4734: 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: phu9cX0wbIbRxoqnhUaOxDBOwdDis5xw0fRoMR41vZYvILAXzLGazuj9GRH+2c7AmkuxSz8jFkFEy28mQgkPVCSNZmg2CTMGUGNYplHP3SRde7alpP0Sn+Z7p60P7+MK5eHE9kqmTlSy5NcC+7TdIqeG3c6kLfbfhuCoawqX30lLVCw45sKBC6iZUGjJXREgNqdDqEvkQI4C/Xa+xmUXmvTPCpAEVNUR1s8CpGeHrKS1VQNmJq7xKV1oq8b3VblIaDASVInZ4Ubk7HbCIlxT9859h6OeIvmZy/Owsh3urwDSUFQfj3ndCXZJE3VxrCWYjKZyHArBl5e7zWuYmWvBSpDRIfx0IuQKNOGLMd1klz35PpppBYK9uyEOTP/4UcXXMHLFkRQehRTOLYXtPrfFLg== 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:(39850400004)(396003)(366004)(136003)(346002)(376002)(66556008)(66476007)(6512007)(26005)(36756003)(66946007)(16526019)(186003)(316002)(4326008)(2616005)(956004)(1076003)(5660300002)(107886003)(6486002)(54906003)(86362001)(966005)(8676002)(83380400001)(83080400001)(8936002)(66574015)(52116002)(2906002)(6506007)(8886007)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 6qXfzDcdYrc+6PYIji1+U18d/YZgtrNXfQJT4MlIy2dKigtJCVrVE7HFxkW/zimTJIWcx/zngA7YPPtKMNNDBeeZElTlbbrb1DI05FWavZpi/9kvnreMcPjeLeix1mZB6i9UTNWSPAnp8CKJn6ExzLg2YujLtJXmLhNttFxYBEmGrFM24E3DoyCTh6y7GhLNhfoj8/HB7Xll3oZeiDK6eHYRqQGqEIlsWQl+oADH2uEWC0unP71lHQiw/xH1ptrUtjy97uxZaaDnf3BioIQ/vW+DOtOSMtoz4rNiOh0cn+K6E3eb69YqeOjw8G5QdcNvU32hyjOx4atbRn/rKG5PXOQg77nAmyMc2L1oBPGoHl4G8gUXkavzkKygWlGz+LTvRVaEEgdt0bi1nVSdsSkwNFqUkm0GNsjErinzf6mslN15Glg9EMCgO2ZuH83ZkcQzEK8NgR44MNC9+9zZTwaO8Lnb0hIXy8yf542GnhzKg3ihcEbZIl+EV/kPEYzjYh2gyPFny2X78uVzoG7BDvbaOUtCmsQFtkDa1dp1d9n66xVwts2bIJh6TGJP8ppyMRfWcfIiNwxHQ0U1stJJ0tqy+JZEPpyc4M30SSVaYd35iQLb+tdgMMK5Fv+QpHqCSSHUUo//lezUfNLgz+VHnirIrA== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93c23425-7e99-4a50-13a9-08d86e9c430d X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2020 10:47:49.3348 (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: uuUHvN2uCeZEE6d05jZGRBG0772BbiTaOeqU0BwnJ1OWcoKNkUWGo1FMVdhhOV7q0rUrp2mrjfrBZTHF++7mRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4734 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 5e10735be654..d1671c54b967 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15799,7 +15799,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 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/ -