From patchwork Thu Feb 17 10:32:48 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: 12749727 X-Patchwork-Delegate: kvalo@adurom.com 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 D7FB0C433FE for ; Thu, 17 Feb 2022 10:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238788AbiBQKdV (ORCPT ); Thu, 17 Feb 2022 05:33:21 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:33636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231827AbiBQKdU (ORCPT ); Thu, 17 Feb 2022 05:33:20 -0500 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2062.outbound.protection.outlook.com [40.107.93.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CCB96549; Thu, 17 Feb 2022 02:33:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UQHU4O4TFXv4vcIpj0x259bRopj3aCvgPKHrxYYfKDIjegepaqguMC1jhlnfPYzoMSLoL9tLHvjyYP5ql6CwpSTt6xBFbTKQ+T5NV20l+1NzX/aArPWs8SSwkZqYXtXrxYZRTPQ3RpMfoMXchF7TNUvMORDV08CtgHjZySbvb4pbv36U7ldW3I7UUeBXxFD8nug2IcMoeyysEP7gsqE1lV5hgta1IpJpq/cBm1fBA7PmkVDbRoSCoTg9oK6PMg3fjqKvDAglrLyd7gOysrCtBtnFlVa9Cv+AH7Q7Wffe/I4yiCfUlSXMtQZ8RSwdgV7yr0RFGi1V677cFhQDx6V1mA== 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=Yeu4I5Vz8S2ER86gFu9UGk+r2rJQR1hZssLFCSZa1ww=; b=FOBndiMIoaihael8d359q9q9xeaaU5U6iIHKzex/+nldIB6CCkinprqQpLCTZu/Rm/0iFiIxiPqqrPXa/Ds6MDl8Q3MLjIT+AFeWLj22xtiRa1+h6fDO/V3moQzVp4EUeCux0ex76Ou3FQHaE/CK76oBNMapktpTqDx3I+p3ti6TRjB5LKCL+eORSVmJyToI4H5mSWGYh89NA05NPNTRyOr51Fn+2k3c95R5snFR/hogvjRA33EwduzlIeKfNCxlwFUkEFjglMFgxohLsyo09DzpH/C+XeHzStzpaoCQfInDkEwXN8H/HoFKQQLf08vAnuonffHyjX74taig/+jYfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=Yeu4I5Vz8S2ER86gFu9UGk+r2rJQR1hZssLFCSZa1ww=; b=kLwgKnNx+MkyNTRgXbLYyeKqvUcSM4qh8cEQ/FcNafY2BUTjqFizunnfJaDPMrxGsNQE6ZDAeFVb5bW8v4K3DjpE1cEoiVfRLLpbnLkMNGVTOLYs7xOE10kvaf9bUEhKaT16WWKOdPZS6v2IfZfRg+AgSevT7bz4UwX4RLxyNIs= 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 CY4PR11MB1638.namprd11.prod.outlook.com (2603:10b6:910:e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Thu, 17 Feb 2022 10:33:03 +0000 Received: from PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::1b3:e483:7396:1f98]) by PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::1b3:e483:7396:1f98%3]) with mapi id 15.20.4995.017; Thu, 17 Feb 2022 10:33:02 +0000 From: Jerome Pouiller To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Kalle Valo , devicetree@vger.kernel.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , "David S . Miller" , Rob Herring , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH] staging: wfx: fix DT bindings location Date: Thu, 17 Feb 2022 11:32:48 +0100 Message-Id: <20220217103248.183770-1-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: PR0P264CA0053.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::17) 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: b594e14d-cab7-4eb4-1531-08d9f200e01a X-MS-TrafficTypeDiagnostic: CY4PR11MB1638:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 15G9ZdBYNQsOq3q3a4Yj9PRfqMFVoQc3jGT/ciOv953TInpVfKSg2A7TikW4h55uLl5AjhFEstHxWoj67E2P3J2cBbUUL5AmF1lWGU6nfYRyMPwQS9ibl1ENL9TglLl/ph66FpuOaagdFnL39uWo6F0qfhMUovePg6qklhSMdMOQmfjnAYcq8H1iRp8RzyCtdlJIC7XLGXT1otWefQW4aKemSL+IsgpagT82dj99LI2ERV3NWCDeLF2pei6uWJvxgm7mtLC4m6kMK2szsHJP3KJiZkqVmWdhhLKdDLOhwvCwzPF8ZFA9EUgmUpwpbpsX65H2NTNmKlR7q7FDwDZiF4Ah6DdZpd+1cgvMBxmErWrw39HDdsPE+WWuOV1V73TRh0Fw2r6yyao44M+H3W4Te+hfAxj8mCbHrLXOeIKBBSUlyKIn4fhfCCz4OM7P5Hwn3s2Srzh47gazWnsNd7WT3OSmWg0/AOwk9YzDAGzXZyJnLj5BKzFeZKHdFPPWh6LyrpzFKpY7j9FP+bm+R298nUwH25CX96BI/9sBhs9RQaXXykcizlBRQQ6ixoOgiUua9TPZYYiMXAirmXXIFDdMsui7QOaqwdt1JkLNHc3xc2oLxHFJHgieUy20rvMZKIQgJLUeqvuagIIq9RNg8Pvx0SreQ5Tliutehqz5sS5crvl70U+lM21OvHrryssMgnCIKmDp4z9QQA9igYs9cdms4X+QHeCUQ+V2ktumJOymTqs= 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)(2906002)(6512007)(36756003)(6506007)(66574015)(83380400001)(186003)(52116002)(86362001)(107886003)(5660300002)(6666004)(8936002)(1076003)(2616005)(508600001)(66946007)(4326008)(54906003)(8676002)(316002)(38100700002)(66556008)(66476007)(6486002)(966005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?MA+0lLZnAvwitjG46NIBrgbwQsQO?= =?utf-8?q?ffFw51A+KjWCWZcexK1uFN/oml5QaseoZxbquPHCDHvNJabx6URXE7NAe9pcSHCUu?= =?utf-8?q?NrUh2FhhDf1YW0PkQeYLUP/9FUlDWAFtsU1M+aFZgZ7hBpe1iD0U1q1J2umgNFFXH?= =?utf-8?q?Qb/uEa6eIcsWHdJ7GPwp3qqR/6ZSUNsxThgsLRJmi0JDrFSvL36IknUXGZoQPb1fE?= =?utf-8?q?yObBtqV3kby1/n+PkI5A/VDVB/OtT+qgPPKlmsjBauxdiduio0jCYO+L7KpKyyq2W?= =?utf-8?q?3k40PLwTZ0LAf5r8wBM9a1ze+OnwHmaYwc8FVrtv2wkzfI9GvMpiElcMrP2fWA4q6?= =?utf-8?q?TRH+lZHiIoI47W+6tyqCm4mXMqNZH4tajWJM9PWn0VbjFJ6ULsuhr/9rlKNFW3FDF?= =?utf-8?q?elL7cM8pV5S4GaRmAdkIQ09k5DmwDZGO8JhoKkHDHvqPs0GTIvogZHmlyUFkAhFfi?= =?utf-8?q?kD6VWGlA6WWrQx68Phw3qnoDjQJPZBexBlM2uwRoZ81q3DkDIcXa6517AWAQeZecP?= =?utf-8?q?LRd3wxYfr/psSpaySEatcIt2gkPVbqGV0jwBoFJsopoNpkwIqTOZaI2CVeFv5pegV?= =?utf-8?q?7XwGvuIiIYdbdlJA0jMo0hSZAN9eJzxfagZBIbG9Q20SoK8fwdEWUgPlWvbwOIVIB?= =?utf-8?q?wP9G0mLb6E4q9HV8/xbXZc6zqF34ZCMjwOEtpcbfS39VfOUylHLT8LYlABWuKQaBa?= =?utf-8?q?/l2u+FWq/1H8dEsKeAqdqx7NtJDkrdlWvlMC1mXP2bo/XqQ8X7/qYf73gWZ5pAJku?= =?utf-8?q?J26F9q9sQlkFVOu8bHiJQxfOM2AvH3PSHuxeIhhlsxKERjk5mvgUAcax5DysCQltE?= =?utf-8?q?auxAYGYPO6XvOqKB1ug5YfaogrcwE9z77WQA3MNMZizuJOk95FodcRlIXPOxyfURD?= =?utf-8?q?Qdc4dJh/Dl98dOiOOtgiaTq3WjpyeNrMI/yuSLYHqX4bwrheMb/IpMtTXhNjAvVZY?= =?utf-8?q?rRfpOAF01rmx1kZKjFCSW9Ii9nnkkTWUyjv/od6yV13GiL0XMy4uDVslGpIQF4YEU?= =?utf-8?q?9USLmctS4X/svP6S1cQZZkJi+fAAagtxreMGIgGhqvXXsRZNyh87WuD/14DlUPaAk?= =?utf-8?q?Ai24D4vg7AsUCwTokkTjKzXURDb1gNSIst7YikRnbsr09I/j8fN3rtJngykXLFb6D?= =?utf-8?q?g5hKmsprsUQH03PRkNDMlUmHsB1IXr3zQxwsf4YKMk91YR/oOUzocWFVOMmGOiWYv?= =?utf-8?q?WJaWbDnjGHVOwmN1c8A2pVkChQwixDFCG5wxJy4k7plJaLfm4WIWN5XiOEh3RxZXU?= =?utf-8?q?fO+yaA9BRbp69jEoeWmbg+yTYTmw26N84yfYKmz9hFphgcf4Fz/lxwSJ8ZJMnQvKX?= =?utf-8?q?2ty7rVGR0cmdcatv1hyIeHO0id4QRy5dOtzDgw3LwIC3RXParVjNuBconch53WGFm?= =?utf-8?q?/AvOrLPsjfk0o7/ztfWypdAwYnuCrtA+8XYiMPBJN2Vm5AioRLVy+6L4OBUIHoNP9?= =?utf-8?q?m6Yz/fhfbB4T+LN9iki/qMuSP3wdgekQPkFFbdK4mLucIBfZKQYnpLWSIp/PtaffA?= =?utf-8?q?g5Nx611FqisfLOUQHLfkt8JNenvvsMImq6dHboSes67tniOY7ep6wnEM32ihUQcX3?= =?utf-8?q?Rh6fEJqUhZP3S2FQtG6DTJdj8ba1nva6P67zc0BHhHsiu7Ro3xh1ok=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: b594e14d-cab7-4eb4-1531-08d9f200e01a X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5657.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 10:33:02.6343 (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: Ge1FtbGLLQpXZ25zf+OBz4ZC4PDuQqHrzH6BPUHjddwgBx+F3YDDNVB7Kog6STaws3b3Yx2THolmuEyP+z/yxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1638 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller Currently, the DT bindings the wfx driver cannot be processed by make dt_binding_check. We need to place it somewhere into Documentation/devicetree/bindings/. After that change, we are able to get warnings from dt_binding_check and fix them. Signed-off-by: Jérôme Pouiller --- Rob, this patch includes fixes to comments you made here: https://lore.kernel.org/all/Yd4CjAM+3%2FPmLSyY@robh.at.kernel.org/ .../staging}/net/wireless/silabs,wfx.yaml | 59 +++++++++++-------- MAINTAINERS | 1 + 2 files changed, 34 insertions(+), 26 deletions(-) rename {drivers/staging/wfx/Documentation/devicetree/bindings => Documentation/devicetree/bindings/staging}/net/wireless/silabs,wfx.yaml (71%) diff --git a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml b/Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml similarity index 71% rename from drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml rename to Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml index c49496357180..105725a127ab 100644 --- a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml +++ b/Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml @@ -3,7 +3,7 @@ %YAML 1.2 --- -$id: http://devicetree.org/schemas/net/wireless/silabs,wfx.yaml# +$id: http://devicetree.org/schemas/staging/net/wireless/silabs,wfx.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Silicon Labs WFxxx devicetree bindings @@ -11,32 +11,30 @@ title: Silicon Labs WFxxx devicetree bindings maintainers: - Jérôme Pouiller -description: - The WFxxx chip series can be connected via SPI or via SDIO. +description: > + Support for the Wifi chip WFxxx from Silicon Labs. Currently, the only device + from the WFxxx series is the WF200 described here: + https://www.silabs.com/documents/public/data-sheets/wf200-datasheet.pdf - For SDIO':' + The WF200 can be connected via SPI or via SDIO. - The driver is able to detect a WFxxx chip on SDIO bus by matching its Vendor - ID and Product ID. However, driver will only provide limited features in - this case. Thus declaring WFxxx chip in device tree is recommended (and may - become mandatory in the future). + For SDIO: - In addition, it is recommended to declare a mmc-pwrseq on SDIO host above - WFx. Without it, you may encounter issues with warm boot. The mmc-pwrseq - should be compatible with mmc-pwrseq-simple. Please consult + Declaring the WFxxx chip in device tree is mandatory (usually, the VID/PID is + sufficient for the SDIO devices). + + It is recommended to declare a mmc-pwrseq on SDIO host above WFx. Without + it, you may encounter issues during reboot. The mmc-pwrseq should be + compatible with mmc-pwrseq-simple. Please consult Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml for more information. - For SPI':' + For SPI: In add of the properties below, please consult Documentation/devicetree/bindings/spi/spi-controller.yaml for optional SPI related properties. - Note that in add of the properties below, the WFx driver also supports - `mac-address` and `local-mac-address` as described in - Documentation/devicetree/bindings/net/ethernet.txt - properties: compatible: items: @@ -45,22 +43,23 @@ properties: - silabs,brd8022a # WF200 Evaluation Board - silabs,brd8023a # WFM200 Evaluation Board - const: silabs,wf200 # Chip alone without antenna + reg: description: When used on SDIO bus, must be set to 1. When used on SPI bus, it is the chip select address of the device as defined in the SPI devices bindings. maxItems: 1 - spi-max-frequency: - description: (SPI only) Maximum SPI clocking speed of device in Hz. - maxItems: 1 + + spi-max-frequency: true + interrupts: - description: The interrupt line. Triggers IRQ_TYPE_LEVEL_HIGH and - IRQ_TYPE_EDGE_RISING are both supported by the chip and the driver. When - SPI is used, this property is required. When SDIO is used, the "in-band" + description: The interrupt line. Should be IRQ_TYPE_EDGE_RISING. When SPI is + used, this property is required. When SDIO is used, the "in-band" interrupt provided by the SDIO bus is used unless an interrupt is defined in the Device Tree. maxItems: 1 + reset-gpios: description: (SPI only) Phandle of gpio that will be used to reset chip during probe. Without this property, you may encounter issues with warm @@ -68,16 +67,24 @@ properties: For SDIO, the reset gpio should declared using a mmc-pwrseq. maxItems: 1 + wakeup-gpios: description: Phandle of gpio that will be used to wake-up chip. Without this property, driver will disable most of power saving features. maxItems: 1 + silabs,antenna-config-file: $ref: /schemas/types.yaml#/definitions/string description: Use an alternative file for antenna configuration (aka "Platform Data Set" in Silabs jargon). Default depends of "compatible" string. For "silabs,wf200", the default is 'wf200.pds'. + local-mac-address: true + + mac-address: true + +additionalProperties: false + required: - compatible - reg @@ -87,11 +94,11 @@ examples: #include #include - spi0 { + spi { #address-cells = <1>; #size-cells = <0>; - wfx@0 { + wifi@0 { compatible = "silabs,brd8022a", "silabs,wf200"; pinctrl-names = "default"; pinctrl-0 = <&wfx_irq &wfx_gpios>; @@ -114,12 +121,12 @@ examples: reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - mmc0 { + mmc { mmc-pwrseq = <&wfx_pwrseq>; #address-cells = <1>; #size-cells = <0>; - mmc@1 { + wifi@1 { compatible = "silabs,brd8022a", "silabs,wf200"; pinctrl-names = "default"; pinctrl-0 = <&wfx_wakeup>; diff --git a/MAINTAINERS b/MAINTAINERS index fca970a46e77..65227f6aabd0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17652,6 +17652,7 @@ 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/ SILICON MOTION SM712 FRAME BUFFER DRIVER