From patchwork Thu Jan 13 08:55:23 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: 12712482 X-Patchwork-Delegate: johannes@sipsolutions.net 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 699B0C433F5 for ; Thu, 13 Jan 2022 08:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233646AbiAMI66 (ORCPT ); Thu, 13 Jan 2022 03:58:58 -0500 Received: from mail-dm6nam11on2085.outbound.protection.outlook.com ([40.107.223.85]:34208 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233398AbiAMI6P (ORCPT ); Thu, 13 Jan 2022 03:58:15 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lcL+d4BinX6j/C7ZB33Baaf+QePecu96SxeDaNyTX2QspJN80AxWCncnvwgKi1CEFox/4vynG0MB1Avs2zmdhvQddvSQ6O0yyI+xT5qmm/tHNZphBeocYdWrxsYdyf/W/du3T+nygz+dErCMBuHPIzwZufo1QRoGule9VOi0kp748NfC9C7Bu0jhv/DYFh2KBNNp4OurhiVXjS/1u1Ztb727L6tLZCjGa44j64DdMGTirluYy919Yeq+Erw2BQLhkiCEHvqOkNsPx5cXV3/ma9/w/KcRCcaPhgwvfkeTXROklR7M+tYMHYnml1jZV+cpUh2nEl0nF6nKyAkJd76htQ== 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=iD+6WoICOOtFeCiCZJGaZ1TH+EHiLNsyD/IL9E5coZI=; b=ZvwiK6sDOme5komHqyhvNO2xZog1FbQUtrWPVoOhqetPuQZaTmu2GTXfjampHh9+hr7l9eDWfO9AR40QMwBLBO3Qv5s9pCdUkAbpCCu5VRMEsC8YDRbzimGYOFJRy5uHfrG5DankuUDiGgMIALanfFnVKAY54wlANEiX14B0Z5A0S9xTAjCaAoiLPlkbsuYuqwUTaVx6e8sp0FPu3wx9kd9TZ4TxWLqLfrERyrShDS0qVoJb3zCwiSxKFTp+PZNniP5vLc9qPXA8Gabwo7ScUVRkr7QnNxOwg5pt/eMtN4hinCZ7Hru8iJY6tDmezT+Ju6cMV7F7ku1VPnPC+q4ttA== 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=iD+6WoICOOtFeCiCZJGaZ1TH+EHiLNsyD/IL9E5coZI=; b=gGUsO4b8m3n+TvHBQAqDIgiUM3Lk4Q5wf0rITk2oydDUBKqydl3f7CYjUxoR65kpl4o6yzAACpZs6TQvfB4Vb9OWF2H/10WMkMAb6ICfodub5uAyCGuRA+wmIyBusX3h3BOTDpDzRtUqqO9MdJMaOT2o3gGZFX5/ODiZ9N28GXw= 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 CY4PR1101MB2071.namprd11.prod.outlook.com (2603:10b6:910:1a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 13 Jan 2022 08:56:38 +0000 Received: from PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4]) by PH0PR11MB5657.namprd11.prod.outlook.com ([fe80::d031:da9e:71a:73e4%5]) with mapi id 15.20.4888.011; Thu, 13 Jan 2022 08:56:38 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 30/31] staging: wfx: rename "config-file" DT attribute Date: Thu, 13 Jan 2022 09:55:23 +0100 Message-Id: <20220113085524.1110708-31-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> References: <20220113085524.1110708-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: SA0PR11CA0117.namprd11.prod.outlook.com (2603:10b6:806:d1::32) 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: e622acb5-36bc-4858-78fa-08d9d6729c3a X-MS-TrafficTypeDiagnostic: CY4PR1101MB2071:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AceXUuT92E8M2I4pabXD3yGiG7DTC1DOD2Dy1niUJ9g/mSX46SlSu2bPBzFwh19Ix0asc/WLewYgVQTVTq1YAsY8k8GcenGSlItX4unmAZ5noJIdNKrIDLIYDqC5SizkT+/SzOYCHLgUoPTOE4s29uow9bM6/SNMa/VbO5P6f0wua3YjJ4VcG+5FVvqJBXaCGsJnUbJYW7IQ5D4j+kLwm8exI14Ty5/7bckoqeoC9rt3hQbZi3IbzP9BUKcVd252+A/UsO/D7I1+Wrx3c0F9eIqbAVPaA8tGiWNFmUKRjcTIFemn9c56+eimTi5ZtzN5fyttiZKFul7oCZ6vWViWBVjFj6j2nLEQdGzhjKNwkL3R39UBTlueR8CmwBqNVYhB5yvI3NPtUMu7fo32qVk0xYBPBLCaraLQAegfJjn5oqgI7FzEx3ZAIkaL2FYly3rDzA57VDRm5RWFz5B4o9X6aloSA447+bOh33NsK+/2mhKrw4s5C2kg8KZ/Z/b3DzWwr70s8yJUS5kJuZwGUXvnJQnxnrXtBDDvV9T22HlyYC8ZhDXXWtJKkb8qTF0hMuea9MN2kFD+100elPZ83mINY7IN/4Ewz+K2KPMOyUKJit5g10CB+w8zZlulkeU589PQflPrkGf9bLAKjtr+zc5ZGA== 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:(366004)(2616005)(66476007)(52116002)(8676002)(6486002)(4326008)(38100700002)(8936002)(83380400001)(6506007)(107886003)(66556008)(6666004)(36756003)(508600001)(2906002)(5660300002)(6512007)(1076003)(86362001)(186003)(316002)(66946007)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?RKr9AfN1AYvWgmQFYpeba4UBl1KF?= =?utf-8?q?3uRB8vQ1pw21x+WZrPOcPsap/NogEiDCiKkF+x0gpbs+XWlEsRaF+dtpQrmeC20cR?= =?utf-8?q?GKrLFOdGgyWCSq9D/jlKmAVEcBqspDAk0SOz+QJ2kJU8mNngLlyaT6Qwv9xZe6wzQ?= =?utf-8?q?Z3Rq/siOZlePiZAfoFx5p7diUFrYmFr3Mr8FD4Iu05GTtcLEDz82jyFjuDoIdQv5Z?= =?utf-8?q?bRWXK9uiPbvMAJ2ObUselIkbRMiQkw0OoEVA06EBRRZquzRkiCrveEEIKDs7WZ6MT?= =?utf-8?q?Ebnizj5N/qHE1HsjZLTslClj/vRjFxBuq/lhxYObiZ2OX/3a1xX1mfdn/zjDxW1qU?= =?utf-8?q?x96QB47iuep/PXB0ZJh5pySBAMQLNfF2NFAjo9HNyrWJuOBx7XxDzh98GHkR329Kt?= =?utf-8?q?4Hufgi1JMOxJMqQGQGtAnoJpJeo4eZ/maAkxF9GPuu+EOYVqaIngo8M+8eA43ZkGh?= =?utf-8?q?To0b9+kayoi65AeMNiXfbPV4H3KuiQ5aEMjEwJcBnDkIwAWfPkAUnPeeTJ+ZiRO31?= =?utf-8?q?JJDYFzamBOS4MbzHa0P8Q7sjft5HVaIQbeSejWk9Wo7DPeBSBkmkqmoxOXXJRhg8J?= =?utf-8?q?FEv+LNu2+ojpHHSufmxeUNMZk5JySo9ri7d+k1izUx8wutia/6mOIouz9FGvKMCpj?= =?utf-8?q?DHYk3fUXr38p4PXupUr/gvO83wV6a62qQcNSuvEXmG9IhvL4ocl3Eh7HL/kSbnEdg?= =?utf-8?q?twKJIvPastK4tRxR0WEmLzQVsRKVnx351KPcVkE2gzobE7oUUdEWHZ4X5OKhhYACg?= =?utf-8?q?TOd/FFkxh0HDzCKbv1u9ZTPUieOZxyLd9/ACj6IbpqM7wBR/eG6yHMu9wJ+Xfnn67?= =?utf-8?q?+8qN2zBH/oOtO2czPP9jjTrARC3n9ilXNtlEbg13IHiZJ0lZem8ZwpOMpnqdg2uk6?= =?utf-8?q?eYuz0avK26N/zZtKJjLujVzcI4/bUvDVkgHECA5ypW2rFJ7QMm0O4BpxOusglJ/n8?= =?utf-8?q?Gc3OA4rmLBc05OVGDzI/fgbroIo8CQoTZxHeCRnzuyeSnx5pjRsL2QCFvlGmYep3u?= =?utf-8?q?HAc2hEyQWRMh0EvUCGbFlYhRHLcgzkNl+rKak/wKGc0PDIpPzp9aUuN/baomAg04i?= =?utf-8?q?FJe0WGAY9cHt0pSAGMXLByzBzTdPVBnObrBoDRunotys7e8AA265/P31NHqYZr+4t?= =?utf-8?q?EecgD8j5wUSP99yComztygWVEXsTd4jcHiL4MModNYPTuF0/xCHAYEMBb/du8FERw?= =?utf-8?q?w8nYy4CyZVRlQTMw6LayzM4LRqNVnkAchRI5T8fmwmuCHsKv8SimpL+/Cc3xeMtcr?= =?utf-8?q?6V2MK5CqwefU1uFxhc0wMMjZtr5TIVyn977QvjAgSLQahMEOp5qL4QkQlZpytHnsy?= =?utf-8?q?Y7ulyTu1DFClvhz1ptauiBPxQ0HmA8ZAow016d/tZh00+ka/qcBqMqkN7rBnBCYnn?= =?utf-8?q?vcZZFo3V7XuBUcxtVCe3tVZ1IcyHB9Lmv0scePAgYtDrOPM620hgE5Uak+7J0mTek?= =?utf-8?q?MSrcW9tze0JYdm609whFTKsNNiQSyYuSOBbZEkXNfb4DhvONx7HQXxfTXxctt/7vu?= =?utf-8?q?iACpNGgzZUPnsIJNnbRYqIynl8z02vw7bAZPCAU/AUyhiZGaqWntxiP23+IAhlE6X?= =?utf-8?q?pxgEiqmDKGmFCpZ2MbDJdUE2HeruOcNbHVv7WasV9tkYnZjS4+0EjY=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: e622acb5-36bc-4858-78fa-08d9d6729c3a X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5657.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 08:56:38.7672 (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: np+4jPrfbKhN/+WlJg9ySDBUxxOtLfTt4/GuwKYF5+3UhRWKNyQxcwmXMi+70qM/l7NLanaI0mtCVCGhXFA2rw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2071 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller "config-file" is too broad. Replace it by "silabs,antenna-config-file" which is more explicit. The attribute "config-file" is probably not widely used. This patch obviously breaks setups that use this attribute. Signed-off-by: Jérôme Pouiller --- .../devicetree/bindings/net/wireless/silabs,wfx.yaml | 9 +++++---- drivers/staging/wfx/main.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml index c12be18eb6ac..c49496357180 100644 --- a/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml +++ b/drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml @@ -72,10 +72,11 @@ properties: 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 - config-file: - description: Use an alternative file as PDS. Default is `wf200.pds`. Only - necessary for development/debug purpose. - 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'. required: - compatible diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index a98a261f6d76..8be9100847a7 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -309,7 +309,7 @@ struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_da wdev->hwbus_ops = hwbus_ops; wdev->hwbus_priv = hwbus_priv; memcpy(&wdev->pdata, pdata, sizeof(*pdata)); - of_property_read_string(dev->of_node, "config-file", &wdev->pdata.file_pds); + of_property_read_string(dev->of_node, "silabs,antenna-config-file", &wdev->pdata.file_pds); wdev->pdata.gpio_wakeup = devm_gpiod_get_optional(dev, "wakeup", GPIOD_OUT_LOW); if (IS_ERR(wdev->pdata.gpio_wakeup)) return NULL;