From patchwork Tue Oct 20 12:58:17 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: 288272 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 64DB6C433DF for ; Tue, 20 Oct 2020 13:00:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03A9322475 for ; Tue, 20 Oct 2020 13:00:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.b="ZYHmmSOw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407073AbgJTM75 (ORCPT ); Tue, 20 Oct 2020 08:59:57 -0400 Received: from mail-dm6nam12on2042.outbound.protection.outlook.com ([40.107.243.42]:21473 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2407002AbgJTM7o (ORCPT ); Tue, 20 Oct 2020 08:59:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ao8V/ru3BjjpPfUiLebwFNhHrqhU/rGWhVCOVlFWO8hY7q/SNbi7+RCOnyXHPYMejZgoNOLEoms+8HWi8PVu6d9bWbghqfIFDYHL9wOtwDKe7PxOWA6CiHLLrjH5RY0rUY8FtYL6eykOtAWWY9xrJj+GB9aFbp6RhU5z3oVBInb5CVEP/Mhc2e5SojbwBFELJ25g2PH+UR+c24IZT0DcUDifxhYfUQdWj+plrD8x8KP4hA4u2quvkV/bZ0w4FzgjFoWHZ7aKLjEnnPa9a0CCXbCtPQyyTBmVpyYTpsxhm9FEGhAMEBLGFCNw0m2VO2ZclfzPGW3ZwXIIDZ7ZuobsCw== 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=QuVX0j6UUCxn+TQOVvQezP9wB7BmuFOYP4LzEze7XgQ=; b=VTYZ/V0zbCBVVw2uHBlXFUH4LlV+opglvOkr7ms9nrokILmmcZ7phQGkTaQbwqcHr1EFh1w6l30HfWAFHu5cwj8D2M2MZZz9Xvk8/qNBlIghwHan9mMgabZKy6QjN0vhVDyXPiSTCoYmApd05BRHM4YKEy6pGXOFOeD4b1tbV3J8vM/hvTscTj/40uVcYoCdFxUir/UCmUq0glW10KH71B5JI+GBMZY8FQ+ED2TE2kMkOH8VGcRhUFEjN91LIdCG+D69dntkk6CloHWQlhBfOYdJofGJLeh9CiYHxoG5Kg1F6BnREtVYpaTIpPrOEzVSSmEXEZsCD4Rd8IQkAGaZeA== 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=QuVX0j6UUCxn+TQOVvQezP9wB7BmuFOYP4LzEze7XgQ=; b=ZYHmmSOwCOKcJXVxLNep7SroCUG3wUmXqof56fZjwYNL9zQA6hwo5FU97AyxJR4oZOlfp7yah8lB2NsrwwQ/EH0B6QZfOK+trTHKawka7Ie8qcao87aNP2JC/lHo49LyPi7VhgJord9+TTD7JbuaSIkYc5rY7b5Dik0D93YbfsY= 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 SN6PR11MB2656.namprd11.prod.outlook.com (2603:10b6:805:58::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.28; Tue, 20 Oct 2020 12:59:38 +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.3477.028; Tue, 20 Oct 2020 12:59:38 +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 v2 24/24] wfx: get out from the staging area Date: Tue, 20 Oct 2020 14:58:17 +0200 Message-Id: <20201020125817.1632995-25-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020125817.1632995-1-Jerome.Pouiller@silabs.com> References: <20201020125817.1632995-1-Jerome.Pouiller@silabs.com> X-Originating-IP: [37.71.187.125] X-ClientProxiedBy: PR3P192CA0026.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::31) 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 (37.71.187.125) by PR3P192CA0026.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Tue, 20 Oct 2020 12:59:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5a44a8d9-af32-49ed-9a8f-08d874f800bf X-MS-TrafficTypeDiagnostic: SN6PR11MB2656: 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: vUu05fel1l2HPBYB9VxXYx+QNU8TmAIH6TCIKX69JciBv03EcObhPNU5MrXuETRkn+9soWo/Ybrwht2pL2eSYPrXivTlllT32UldbaUbKeoM19pZUzzJCk8GJH6Zqe2Afygn3Z84C8o36Y0b06srBSkEI3RB61VHG9Znqu00w1EaznJMorMfXeFSJ1X75dw0/boft1Ci8eClGfCuLEh/TzJLk/eSwoWwTmsWdvKxFiF4zKtbgz7Aefaqh+YS01WNfsXaqo3cTAXCdo8IsirLeaMhWUgdqfMD8mJc3GCbGfHKW8VzWNZsiZko79FnKKbV7eWMXFWy5ia6cAYi/t9yDFhvOMlKS+nt+/b4ISXvTLTdzZTn5iBTp2YpuNc05Q5k6CH5TqdAqyvmEC4/DQ51eA== 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:(396003)(366004)(136003)(346002)(376002)(39840400004)(186003)(316002)(4326008)(107886003)(8676002)(86362001)(26005)(2906002)(7696005)(478600001)(16526019)(956004)(6486002)(966005)(52116002)(36756003)(8936002)(2616005)(54906003)(5660300002)(1076003)(7416002)(66574015)(6666004)(66556008)(66476007)(66946007)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: MDETUYgLqhVJgYZI2HpVbleYSYkLRACTjKAeCqUuBZxojetiz3b6xDK/FHhJ6u1wFuAnT61utqYdhcADrYrQcb5jUruGFYOAayATX4GiW4UHlpeFl0qQTSfAgvy8eqZQXQJvtHnxmRFapGtY9UT+X302EWgi7IJuY7Ta1F5bt+zDZO/cz+zGiJHJuGG75WK4qmgB/HpRFYCCkSrmL/i9ZAZib4UgCX9sP6HSFQqLov53LEYKgHwf5JjWe9MGaZMl+Y8WdOlDv6a/yfvXYbr8/0bY0AffQ/+6737zd7OM89xl7prtSNJ1NbyYQVaeTt1mZmGN9Z7gLQm0hAVjCcAmMCj3PEovLFN1BGFqJZSeXP0bOLojMlWl0oFY77nSWr4K0mwCuwWcQRGRftZ5GuTWDm79AADjE39VKHiUMU+PPvSkOagn3e4pbjPLYpU7cYtt1IJwKkOPpHeDa+NYhCrmv6nu1sP2622qCq1W9lTH/l2pMzYZjmrAKpowJWQ0JG/Ktmx0EkgNZOo/M9kv2v4U2IbInM2Osnpby6Tkczb54ADzjrK0YZcnbYs0nvuaoM3sS2eWgt2N0IsJsssJfElyuI6W4FLRU+h4pOQgn62FiduBARo6olnba8bQz11/pATW9iS4x7kqj/GCDYAmxJxdBQ== X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a44a8d9-af32-49ed-9a8f-08d874f800bf X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2020 12:59:38.7522 (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: gfTChqdfADM3FvvJE+BpHxzE6aBe5gFORAT8UbgI0AtkFICf/QLEmL1txIQxDQm0MBoYkCLKkx3vRiKaLbYaig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2656 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 b158ec4a5e42..bc5dae823576 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15956,7 +15956,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/ -