From patchwork Sat Feb 26 09:21:42 2022 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: 546405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72276C433FE for ; Sat, 26 Feb 2022 09:22:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230387AbiBZJWx (ORCPT ); Sat, 26 Feb 2022 04:22:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230381AbiBZJWu (ORCPT ); Sat, 26 Feb 2022 04:22:50 -0500 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2055.outbound.protection.outlook.com [40.107.220.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 004B027147B; Sat, 26 Feb 2022 01:22:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NqAhDkqSims37B8DdvYtdBV0zasNg0owHVjuoxqBdnWe5TzBMIZ5o283gF8XPSzA8Vzus/I+F2WY3Oy0AsdpXdhxn6NjCqQkfmgy+TdpHqatPSliMgY7DKWAeTGAdwLA0BRf4iPUVnlloScTv3n4mWPCG/dM9EyjZPAsd+7CChh6yuXD2am6uuvK2Hf2VaCGELpy0XY6nx44KK2UtkUdpUToqs6FBP15+cRYLquMyHUIBBpvy7m5aAnO1cQl1kqzSpeYMZKCZmfy6zgnE+qaaYY5Wup8mDwiMpoD4oin3TOoHkM3hyfFCKZFfEiuq+m+wF5nRntfydtyfvEfkF4f0g== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fmpFFTcw5hN16XpsYisDUQT4PKZ/DGMoSUeutvJGa4o=; b=NR3Avu2hPBZT3xXoL3+Twra/DK7+CBqCzy0vAys1bQgaHYv/cOOqZLfWVDDQfEv3Qhk1PO0CCf4eWecYWfne1PglzFd8Ub9ljp8jrhvgisF3sTvB67ea9rqcqsAJJR6ymJiz65K+iwEI/M5K7GVBeHlaIZ0MHdKUqdhpfGLtj6/kAQ82qMIJLGtU1AZhXw/cx0iYfXrcTiJmL3MBqDSrBDO38j3T3+lB4ZPgDG3b7msQbIjuYCrlQT4FSjGrlO/BPkm2XoxCjKU5SSRbPp43VImMaynQgIw0fxTwfLAgIFUBdI1+8VUcQ3HVT6R6Jq3o6aTNqqw982xXqtGP17zDpQ== 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=fmpFFTcw5hN16XpsYisDUQT4PKZ/DGMoSUeutvJGa4o=; b=ZrImPfkwM4zGedlY63UhsSVyBh4apolhVsm9AdcPFL4ci2koThcfDnkeszUdPy+OjVA6bCAj+5wqNK/A7OCg+ylXQ9ZAspk43FJB/VZeOaeWTgWj8SIMURuUenP3qsBFE+VaYLl4y7W/cXHXDG9ge6RllVtju7Xx5OFw1mDFN4o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=silabs.com; Received: from PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) by CY4PR11MB1429.namprd11.prod.outlook.com (2603:10b6:910:9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Sat, 26 Feb 2022 09:22:14 +0000 Received: from PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::dd2e:8a4e:fc77:1e66]) by PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::dd2e:8a4e:fc77:1e66%5]) with mapi id 15.20.5017.026; Sat, 26 Feb 2022 09:22:14 +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" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH v10 1/1] wfx: get out from the staging area Date: Sat, 26 Feb 2022 10:21:42 +0100 Message-Id: <20220226092142.10164-2-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220226092142.10164-1-Jerome.Pouiller@silabs.com> References: <20220226092142.10164-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR0P264CA0145.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1b::13) To PH0PR11MB5657.namprd11.prod.outlook.com (2603:10b6:510:ee::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 421eff1f-c77e-469f-3588-08d9f90979b7 X-MS-TrafficTypeDiagnostic: CY4PR11MB1429:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PSatPubYdyCzbq44XAMXy0ND2eA2m+3CjkaQ8YbXmDpMfCKo0rG8OMSkpWmrTqkDf27GSKh8DV4tPRsWxEKGIT5tzjPmV4yfgZENVWEWs/JLDb1RhyXDSpsavSUW6O5z5xEPf6enQcuqp7dOl2uRPE0t5XvnuD9+5n7n0KdfTgImfINLBj/uycbxuQceeKFCXe6vhurh03ZUbH3YL4scNmiNxoffLWYWmtPpWhsuHjhcANShOha6o9tBN7FVIj5/2y8YNqvSXjWfwMr6uFSgZzZjeYscV48lUQG83U3AB9rQagAx+4SWRd6nqbn+6Q95a6bLYVYDKc4VZywZmNyJCL0jTwqk/ZvaQPDY/uthLPXAFxfyzQJHccWGzSGWPStH0XUmTwms9XZQw1qRL0eCPONn/DJDWR+/uhW/bT0X4rzeEAfQGUqqAeoRcN6jZWNgJH/eoANAf4iBKbIW6MIuPgal5go34+k5ePlLcY4rRIAUXBnhPmv1Fk5aWv/CswzLpNhCClyEgwTyOh5IZD/uHPoc7g/HKyMJzQ35dqPB368RcyGDzVqnhR4WsWRS/lKX6ARa96mxIM1lsW8WnW/yYnj8Ndb5EuOPDCsG+5bbgCMekuFvovc/dWIWUZ5q47DPDgcwivdDrzFttiaRw22hAozC3+uAPnRi7jnVNBpKUoavTNIV90x71C9rctLgFCJCquWFeo4nghT9EPD8NIKrWqGcaipLlB0gyta7ZEGOxi4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5657.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(4326008)(8676002)(66476007)(66556008)(66946007)(508600001)(54906003)(316002)(86362001)(966005)(6486002)(5660300002)(8936002)(83380400001)(2616005)(1076003)(30864003)(6512007)(186003)(66574015)(2906002)(6666004)(38100700002)(6506007)(52116002)(107886003)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?imzJANj85Pi+SA8bycGaxj2zyg9A?= =?utf-8?q?9LlTdd9AtxUfgBe5P5dVGGnXDZiCsKtzeZtnKcRmtQYg93mernReqCDqF+LHTMp6t?= =?utf-8?q?hj6xwkFP+/e5lvx/q3A9b3z9a1AqIbFGpiXr4JbaWkqI+xjuknLyScp1Y9JqCPOoX?= =?utf-8?q?OTN0Ow6I86oXKTiG0F2o0gbAyolhpTor/8VfDY9rXZdhuuamFCxeNgN+DTznOP2zx?= =?utf-8?q?N+SRbJoiqmVM2UG99u2DxWk6h66qZzaKOjod2L97QI5fS//ZjsB0dHXhMx5WbuAHW?= =?utf-8?q?LvXapOgulCocreQvMCEmB0oHHDsZZzY8oRq31HIdqgD1A8isneUETj/Bs2kWiOg8z?= =?utf-8?q?uN4wmzMlVv3ZnPLHfnGFhwa4upwTfOW9XcqZo9/Bha1KZdN8y2vvPc2kmVGd3dE0n?= =?utf-8?q?ROyLI+78Vu6wrWsg9F04bMLsu+PE+sEkxoGlFgOPGNTNWyhnw34nHocjk3F5ZueLi?= =?utf-8?q?1WoCEMoy1LXY1jlF2+CnqYMT4Zogyh8HkEMQ0sNKscbC6G32jkYsSGuQtwspzu8ga?= =?utf-8?q?blndQ8xeV+sfmDH4Ess/y5/L2aQ/kWP569eY4G6Gv/zmT5AN7cb5yRDFc3c9MNX2a?= =?utf-8?q?IZr+jRgaIHl7AULvDBd/XJ9UuVrh4bzeSfb5NZVr1dido48kKZAWR3C3eFM+LJUGd?= =?utf-8?q?ywi/riPMC3ck2DDkD0KVBZB1nagOl7fyyDTAr7h3IT39GsxI4RLDe7TaypiC3cbB4?= =?utf-8?q?yo6HtH2GZLvLb3w5L0fQGr42INtmNNMsY07VM9eyVP1eEz7i928P8s+Wl60OjyrUJ?= =?utf-8?q?bnst51cFarveBv31b79Z9UMIgXkmImwnFXFPFJuzKZcza63aI5A0Dab/nv+gFt+K7?= =?utf-8?q?kde6fmuHBrOle+sNkCS3OW3wwd5IefUx+trmHONoIBVSFLFjWYQ4L6ILke8awBKCh?= =?utf-8?q?IM3Vmc2TEmXqc6rFgwEtWPbbX3LVKwMxI7NeU2OLa7jNS9Dx0ieI3AoKugoHdZu8B?= =?utf-8?q?2YgJV7aowIQ/G9Az9GZ29zZNVeBqUgf55DOW/pOUZKBlApzcDTS1r4/NLOUde9LjK?= =?utf-8?q?/msPRhnlNuGHpf9UfgejFq1l0T7c6AbWJtso6ojpRjtNMjmFl6uQY+X3KP7nAPOY1?= =?utf-8?q?1z2a/1t3633zSGfpaWg97ynelYXE3EN0LNG9pnH0RUzlqKayg2oH1DVV4bm8sPcKx?= =?utf-8?q?7C0MHmn02yQje78OfUEjTRDmm33cXRf1P7w0lElz/Utsr7ZrbNbQcoz5ha59PmNxf?= =?utf-8?q?1UEofEEiHXd9PumFuOarNSGf+/IV0/E5qrFqBLg3MZrh6l25r+QVfGygFm8VwMvhn?= =?utf-8?q?Nbu54/LmHZTL7ympu+m3UI50GvT9cqenwRwwqwogP/4dlp7yvnmxy+/hS0fhPnbFZ?= =?utf-8?q?iYX2tIbvtqWEC8koTxypABhU6bGB118aeHrSqyMTcYDJiBayZ9CpfMpX25/YSUHM3?= =?utf-8?q?KgRFjI9GGCOjZ1/I+bpksEI/Cg1HgvLbOALNTnjYpXn7dJPipYoG82oRt92LDx2Kv?= =?utf-8?q?QWsR9/4VBvEy3C3Nw3Sdj2AUehV9Q03G9VrwdfWGZLVRPkJDjG0Nhv9G44szwXO+1?= =?utf-8?q?piU8M2Ey1ivS/Lfogq0Y74of3Nlk+4Tc4VRYve6cIZOa+SIv8MLtkbWsNOYsbsgrs?= =?utf-8?q?RGWE7Xi48GO0ZyzQIaUMmbRhxVYHowcSsKJVlKebjG1unRF1Kq1RE0=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 421eff1f-c77e-469f-3588-08d9f90979b7 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5657.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2022 09:22:14.6719 (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: hUvm2TfDtMSCGT3yudI1YdWzNlcJWO0+PKSuMnQFrH6JB3UemlK8SXOqAjGA8XVOe99wK2i9Xx1Tft5A7y2yfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1429 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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 --- .../{staging => }/net/wireless/silabs,wfx.yaml | 2 +- MAINTAINERS | 4 ++-- drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/Makefile | 1 + drivers/net/wireless/silabs/Kconfig | 18 ++++++++++++++++++ drivers/net/wireless/silabs/Makefile | 3 +++ .../wireless/silabs}/wfx/Kconfig | 0 .../wireless/silabs}/wfx/Makefile | 0 .../{staging => net/wireless/silabs}/wfx/bh.c | 0 .../{staging => net/wireless/silabs}/wfx/bh.h | 0 .../{staging => net/wireless/silabs}/wfx/bus.h | 0 .../wireless/silabs}/wfx/bus_sdio.c | 0 .../wireless/silabs}/wfx/bus_spi.c | 0 .../wireless/silabs}/wfx/data_rx.c | 0 .../wireless/silabs}/wfx/data_rx.h | 0 .../wireless/silabs}/wfx/data_tx.c | 0 .../wireless/silabs}/wfx/data_tx.h | 0 .../wireless/silabs}/wfx/debug.c | 0 .../wireless/silabs}/wfx/debug.h | 0 .../wireless/silabs}/wfx/fwio.c | 0 .../wireless/silabs}/wfx/fwio.h | 0 .../wireless/silabs}/wfx/hif_api_cmd.h | 0 .../wireless/silabs}/wfx/hif_api_general.h | 0 .../wireless/silabs}/wfx/hif_api_mib.h | 0 .../wireless/silabs}/wfx/hif_rx.c | 0 .../wireless/silabs}/wfx/hif_rx.h | 0 .../wireless/silabs}/wfx/hif_tx.c | 0 .../wireless/silabs}/wfx/hif_tx.h | 0 .../wireless/silabs}/wfx/hif_tx_mib.c | 0 .../wireless/silabs}/wfx/hif_tx_mib.h | 0 .../wireless/silabs}/wfx/hwio.c | 0 .../wireless/silabs}/wfx/hwio.h | 0 .../{staging => net/wireless/silabs}/wfx/key.c | 0 .../{staging => net/wireless/silabs}/wfx/key.h | 0 .../wireless/silabs}/wfx/main.c | 0 .../wireless/silabs}/wfx/main.h | 0 .../wireless/silabs}/wfx/queue.c | 0 .../wireless/silabs}/wfx/queue.h | 0 .../wireless/silabs}/wfx/scan.c | 0 .../wireless/silabs}/wfx/scan.h | 0 .../{staging => net/wireless/silabs}/wfx/sta.c | 0 .../{staging => net/wireless/silabs}/wfx/sta.h | 0 .../wireless/silabs}/wfx/traces.h | 0 .../{staging => net/wireless/silabs}/wfx/wfx.h | 0 drivers/staging/Kconfig | 1 - drivers/staging/Makefile | 1 - drivers/staging/wfx/TODO | 6 ------ 47 files changed, 26 insertions(+), 11 deletions(-) rename Documentation/devicetree/bindings/{staging => }/net/wireless/silabs,wfx.yaml (98%) create mode 100644 drivers/net/wireless/silabs/Kconfig create mode 100644 drivers/net/wireless/silabs/Makefile rename drivers/{staging => net/wireless/silabs}/wfx/Kconfig (100%) rename drivers/{staging => net/wireless/silabs}/wfx/Makefile (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bh.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bh.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bus.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bus_sdio.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/bus_spi.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/debug.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/debug.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/fwio.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/fwio.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_cmd.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_general.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_mib.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hwio.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/hwio.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/key.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/key.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/main.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/main.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/queue.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/queue.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/scan.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/scan.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/sta.c (100%) rename drivers/{staging => net/wireless/silabs}/wfx/sta.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/traces.h (100%) rename drivers/{staging => net/wireless/silabs}/wfx/wfx.h (100%) delete mode 100644 drivers/staging/wfx/TODO diff --git a/Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml b/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml similarity index 98% rename from Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml rename to Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml index 105725a127ab..f5a531738d93 100644 --- a/Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml +++ b/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml @@ -3,7 +3,7 @@ %YAML 1.2 --- -$id: http://devicetree.org/schemas/staging/net/wireless/silabs,wfx.yaml# +$id: http://devicetree.org/schemas/net/wireless/silabs,wfx.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Silicon Labs WFxxx devicetree bindings diff --git a/MAINTAINERS b/MAINTAINERS index 65227f6aabd0..d6a14f876c6c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17652,8 +17652,8 @@ F: drivers/platform/x86/touchscreen_dmi.c SILICON LABS WIRELESS DRIVERS (for WFxxx series) M: Jérôme Pouiller S: Supported -F: Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml -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/wfx/Kconfig b/drivers/net/wireless/silabs/wfx/Kconfig similarity index 100% rename from drivers/staging/wfx/Kconfig rename to drivers/net/wireless/silabs/wfx/Kconfig diff --git a/drivers/staging/wfx/Makefile b/drivers/net/wireless/silabs/wfx/Makefile similarity index 100% rename from drivers/staging/wfx/Makefile rename to drivers/net/wireless/silabs/wfx/Makefile diff --git a/drivers/staging/wfx/bh.c b/drivers/net/wireless/silabs/wfx/bh.c similarity index 100% rename from drivers/staging/wfx/bh.c rename to drivers/net/wireless/silabs/wfx/bh.c diff --git a/drivers/staging/wfx/bh.h b/drivers/net/wireless/silabs/wfx/bh.h similarity index 100% rename from drivers/staging/wfx/bh.h rename to drivers/net/wireless/silabs/wfx/bh.h diff --git a/drivers/staging/wfx/bus.h b/drivers/net/wireless/silabs/wfx/bus.h similarity index 100% rename from drivers/staging/wfx/bus.h rename to 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 similarity index 100% rename from drivers/staging/wfx/bus_sdio.c rename to 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 similarity index 100% rename from drivers/staging/wfx/bus_spi.c rename to 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 similarity index 100% rename from drivers/staging/wfx/data_rx.c rename to 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 similarity index 100% rename from drivers/staging/wfx/data_rx.h rename to 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 similarity index 100% rename from drivers/staging/wfx/data_tx.c rename to 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 similarity index 100% rename from drivers/staging/wfx/data_tx.h rename to drivers/net/wireless/silabs/wfx/data_tx.h diff --git a/drivers/staging/wfx/debug.c b/drivers/net/wireless/silabs/wfx/debug.c similarity index 100% rename from drivers/staging/wfx/debug.c rename to drivers/net/wireless/silabs/wfx/debug.c diff --git a/drivers/staging/wfx/debug.h b/drivers/net/wireless/silabs/wfx/debug.h similarity index 100% rename from drivers/staging/wfx/debug.h rename to drivers/net/wireless/silabs/wfx/debug.h diff --git a/drivers/staging/wfx/fwio.c b/drivers/net/wireless/silabs/wfx/fwio.c similarity index 100% rename from drivers/staging/wfx/fwio.c rename to drivers/net/wireless/silabs/wfx/fwio.c diff --git a/drivers/staging/wfx/fwio.h b/drivers/net/wireless/silabs/wfx/fwio.h similarity index 100% rename from drivers/staging/wfx/fwio.h rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_api_cmd.h rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_api_general.h rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_api_mib.h rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_rx.c rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_rx.h rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_tx.c rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_tx.h rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_tx_mib.c rename to 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 similarity index 100% rename from drivers/staging/wfx/hif_tx_mib.h rename to 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 similarity index 100% rename from drivers/staging/wfx/hwio.c rename to drivers/net/wireless/silabs/wfx/hwio.c diff --git a/drivers/staging/wfx/hwio.h b/drivers/net/wireless/silabs/wfx/hwio.h similarity index 100% rename from drivers/staging/wfx/hwio.h rename to drivers/net/wireless/silabs/wfx/hwio.h diff --git a/drivers/staging/wfx/key.c b/drivers/net/wireless/silabs/wfx/key.c similarity index 100% rename from drivers/staging/wfx/key.c rename to drivers/net/wireless/silabs/wfx/key.c diff --git a/drivers/staging/wfx/key.h b/drivers/net/wireless/silabs/wfx/key.h similarity index 100% rename from drivers/staging/wfx/key.h rename to drivers/net/wireless/silabs/wfx/key.h diff --git a/drivers/staging/wfx/main.c b/drivers/net/wireless/silabs/wfx/main.c similarity index 100% rename from drivers/staging/wfx/main.c rename to drivers/net/wireless/silabs/wfx/main.c diff --git a/drivers/staging/wfx/main.h b/drivers/net/wireless/silabs/wfx/main.h similarity index 100% rename from drivers/staging/wfx/main.h rename to drivers/net/wireless/silabs/wfx/main.h diff --git a/drivers/staging/wfx/queue.c b/drivers/net/wireless/silabs/wfx/queue.c similarity index 100% rename from drivers/staging/wfx/queue.c rename to drivers/net/wireless/silabs/wfx/queue.c diff --git a/drivers/staging/wfx/queue.h b/drivers/net/wireless/silabs/wfx/queue.h similarity index 100% rename from drivers/staging/wfx/queue.h rename to drivers/net/wireless/silabs/wfx/queue.h diff --git a/drivers/staging/wfx/scan.c b/drivers/net/wireless/silabs/wfx/scan.c similarity index 100% rename from drivers/staging/wfx/scan.c rename to drivers/net/wireless/silabs/wfx/scan.c diff --git a/drivers/staging/wfx/scan.h b/drivers/net/wireless/silabs/wfx/scan.h similarity index 100% rename from drivers/staging/wfx/scan.h rename to drivers/net/wireless/silabs/wfx/scan.h diff --git a/drivers/staging/wfx/sta.c b/drivers/net/wireless/silabs/wfx/sta.c similarity index 100% rename from drivers/staging/wfx/sta.c rename to drivers/net/wireless/silabs/wfx/sta.c diff --git a/drivers/staging/wfx/sta.h b/drivers/net/wireless/silabs/wfx/sta.h similarity index 100% rename from drivers/staging/wfx/sta.h rename to drivers/net/wireless/silabs/wfx/sta.h diff --git a/drivers/staging/wfx/traces.h b/drivers/net/wireless/silabs/wfx/traces.h similarity index 100% rename from drivers/staging/wfx/traces.h rename to drivers/net/wireless/silabs/wfx/traces.h diff --git a/drivers/staging/wfx/wfx.h b/drivers/net/wireless/silabs/wfx/wfx.h similarity index 100% rename from drivers/staging/wfx/wfx.h rename to drivers/net/wireless/silabs/wfx/wfx.h diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index d1ce500c0319..1cface7e28c2 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -90,6 +90,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 82e912a7586f..6a04e9b423f3 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -35,4 +35,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/ -