From patchwork Thu Jan 13 08:55:21 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: 12712473 X-Patchwork-Delegate: kuba@kernel.org 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 AD3E8C433FE for ; Thu, 13 Jan 2022 08:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233608AbiAMI6y (ORCPT ); Thu, 13 Jan 2022 03:58:54 -0500 Received: from mail-dm6nam11on2067.outbound.protection.outlook.com ([40.107.223.67]:58624 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233316AbiAMI6N (ORCPT ); Thu, 13 Jan 2022 03:58:13 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HzHHX0TBdlgcBX5pY0upSTyWx9O6U44IeQGrIY8cUYgizpDbWrWfOV2j9YMWWQ388u4cQ3bhJVmr0f1Ge3whzD4fZr8BJYX66otC9txV/ZP8ty4NL1Nxl5DWxfkIqqTHrHfE88jpoX9ItzgfC95KPwXGCypO8vA43McNRgPg1KQ4CNi4f+xvR4H5TmoKwp0PgP9xAoctxBw5VaSyg/TPsOLvGFzbh/cDlkS2gZbCt7ZAbBTi5BlyVorJJnDkizVtopPPmZqhxOkXOuKu9WXRA2l7irrpqctCSV5X0V8jdHzDMM4iwrwL48s3VlJ+PgVddfQM/aE8EQzTh0BJ54ZvfQ== 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=1aK6ov8zRbVG8S/MtvHDM7CeICXT7XcnjPMy+BeWdfc=; b=Yanhdu8j9v3YBSxbXohpaUMiu67Fag4PwvC7X6Kemt812mhOX6K8z1TtNy5h5dDP1d5mGrSfAhREZXlBFNRzLp1qPVfJfsYVVqv/AsAD1XBTmjY3tc4GzHVeA9Unb+HPcaKLwtXUDbJ5k6fpTfe1U3723xxeTUSpc0V3NwtMI7nqIS4sm4bPr9QanDRAVjptAiHCLuQww0lWjUqjhD91NS/rOCx4j2B/kVv7X4WIs0y1mmP4RtExy295p1Wj2oHzYLCWMi6y7c198efO1zHjWLLm9xURJKDPwTGhrNcZHcxjuzIEeDecHcu2UsS7Xecxl+1XqHvi/gciFbRhC9OJ8A== 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=1aK6ov8zRbVG8S/MtvHDM7CeICXT7XcnjPMy+BeWdfc=; b=KmCW71rWmEs5vjH5hcg27mIuBwUuIXrdZ7jf9RiHhJNHZyC7VGQ1Xpf691n5O6ScEeWJ8jJPo83IZmi7efHuDVDjnKEvm0RyEEH+wuFDrpZom7g3OUsZNHk/0Jl3y1Hda82syLAy3OfLkc04gbjI28ijpJFQW456I4MgdWN9Y2Y= 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:34 +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:34 +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 28/31] staging: wfx: fix firmware location Date: Thu, 13 Jan 2022 09:55:21 +0100 Message-Id: <20220113085524.1110708-29-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: d4e8539d-cd57-4abe-b40e-08d9d67299a8 X-MS-TrafficTypeDiagnostic: CY4PR1101MB2071:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t8jgKQIQxM69nJSHVx7+rtasFF+rzAmx47gj1JQSqj0ku9/qYPuKOPNA8qEMD7dPeU8U9aAekmV0NLysOgOIiOxXTGar/5pwKvs2IuzuhH4XgtApSHqnf98xgok+TbriGcj53Kl5R/yoXC+5zejteMIZQ50pIeEsrfZkGT++oaYciqSkWCqXsUC6kCQIlTuXdmHDregKRVwB/IuKkzfU7nc3MBDe1hjY9GKIShI6nnpNUhIWGoPEni9CFCcQNhwzZqEGbEqx79Vk1qBZYsNzfNinXGEj8ZmZi4PJb8mqPjTxhWV/rKoGamT9xfHOULGRa1cubi4X053qfAUf/2ZRG0CNWH6R1HzX/SO8hrMudpln8UxhZJVkdhTqvUWpbgkLfwHaKifOrtWzBHjgB938jNDPFkxRu5wMqM9tbqPRnJIIt/LtH9IzD3OuTllDAqyPSGFKo3VKm+V/WiI5Nmuosf60Ja9Z95FVnriv74mfsCkDeCoZltnO4zEv8q0LSAhL2YwDLTFA5gqPUDJW8GAYYgGu2Nwsoe2USz+CsOx/pXWYtgqa9rFf7t5vOpJNIYzKTmA2TuONc1hJZ/pwMJKe6eiaT33q02D2cC2cZ42L2SqzesP9VVwCq/soIkBy4X6yZamofItrG6y/0R/TNuJwKA== 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?no7foEAeN3upfOjeLUVcJP54IY6Y?= =?utf-8?q?XgJ+e2ObMWiwzAzrO9WyhwxdkNuaSjj/jzZbJT6G9jjOVx6vnu97oRX6NcEf9Ke10?= =?utf-8?q?yC7Z5Wt/KJw5uv4603oBAta90FCF1aKklruFG3Lt+MwuFBGnkrfBkBq4o5njRwTFN?= =?utf-8?q?Er2D6QVWtVs0l+p5oRNc71BPae0HMNvZUwUlFNe6VnkEPSiPqRRd56yzAsv7NrR03?= =?utf-8?q?lruwHJkkGRxoljUNr035LnyffGmlD71aEhiXIiN90gJ2y0oTmMYN7akTre6lpjm77?= =?utf-8?q?9GqU5fL3TWDUOJAP+7X0IhvInlPThG7yfZ1k9hlfnIfv+DsM9frAZST9NSEjEiuaW?= =?utf-8?q?JgkWcAGtZsWCL5dPvVy8FkSsYhpdcWaVML+lv4pI6J498ut3Fb6/vHLzPU9TNWK9m?= =?utf-8?q?bz1mbz2KbFBko3jkj1FxHjpFh4hnCJyzm9Aa8ZX9OH0zkZr1CTpesU8Hw4h88ZmU2?= =?utf-8?q?RMDFwqzUIoCRCzL9yGxQYWkxC/ajACEac/MKVQq+S3pkiEV3mQOK2UeewwbCJgR+U?= =?utf-8?q?/gGsp3pCmCAKo89Q/eksLUbxMxTte68NXbCvFqhAZrXl0uj+A+HNl3y1ISJ+xXhxV?= =?utf-8?q?4JtiecptzITM6obkdXpMXiPpohg2OQEakHVE2jEbaVEMf+JU8Q3RwTfTBXnqqhzuw?= =?utf-8?q?ObtxKjB8Gk+otxWhrv7Z6hkwDn6mB1vA/gK/4nZkxZ0Y7+M1VqzFVOlwKwWgmtAnC?= =?utf-8?q?15ClPLWA7LWcZlN6NPyi9LnC0RBhS67U9jo+0+OmUlbH3Z+MpqPb2UsLpHj6VIdkO?= =?utf-8?q?erKxBcvx0rhsZGQcosV2zUgx7KaWwdtzMOKanSajDyEq9u9cwHiAXVTrLPIoVHacU?= =?utf-8?q?H2KfQRRr6i3CnB10hK6BfSlaxFcCQyPp8Ii3BKHRpRodI4LMGfcWh9v508gOAi/J3?= =?utf-8?q?tcnjXwhAxH2KH45WKVjxM1i8aTNM2HHYQV1H7HPrqtO2XKWLXfRUnc0zfycjhRbSy?= =?utf-8?q?DMGk6ByXx59w3SMc5JMdZFxeL12zgu9kzScNPudJG4hvxtgEfwa5vWys36lj39xIi?= =?utf-8?q?49RxAbvG/oWw3Q9KHMgHn8vqkqzIR1kaTMgcWoQNT1ilpJpBQMPTdbKoAlY0W0bbG?= =?utf-8?q?lnbBGdzjjDxfQv9e+N/I/9AAsqUXj1ijcEIBX0mqUsTFohog9qoHFUTXD7oZIwGcr?= =?utf-8?q?ddV9uKmBSbgMWdXMguOsZLdJlODTKWhzgHwFUcD2o8FaYts76d7/KSbSes8RqCoES?= =?utf-8?q?NCkjwvZBH34Zyp3EcsIvPypk5yeDdCVHlaijLMdZz9/dDx4VvC0lljNYzhEYCXoN5?= =?utf-8?q?RMXtdCjZU3FQ3k2JlDO89nnoZqvSMLYoSfkmfl1jBF0K7tyoiJsDovokO1YDFDLtL?= =?utf-8?q?Q9u9ZN5m9Vzn5nhUjSlvYkq5eWsEnsv8If8figetGxxgq6j39p6uHCpf6dihjcC1e?= =?utf-8?q?HOzv0kCYLYeioB0cIXGYBLM5afbFb4jTVF3uUGS4Y9Rgn6xSonrOnht1HWR7c7NAo?= =?utf-8?q?FruXdw45L9wl+7oqII8pDO5Yo7UZcl3vIerchpKd6mIT2cT5t1y2nET6RJXj/juVR?= =?utf-8?q?15H4PMh+0REMbrNYtICDgY9rW+ho9n7Kg2isTbR/D+4PgCuI21nciNG5Q8dYrrpha?= =?utf-8?q?mlWtw5GeH0NxELAVdc/FmelfpEAzZFiHvgU5WgudB14mXBaLKWuxLg=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4e8539d-cd57-4abe-b40e-08d9d67299a8 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:34.8314 (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: AbSBovG3m7O58PVDX0MS0ZnxqRfwN90SyeEQVCotrNsWSm1prga6u0u5/HY4j5GL7Kyc2fJqK/FdAFLojLpJmA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2071 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller There is currently, a mismatch between the location of the firmware in linux-firmware and the path written in the driver. We take this opportunity to relocate the WF200 firmware in wfx/ instead of silabs/. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/bus_sdio.c | 16 ++++++++-------- drivers/staging/wfx/bus_spi.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index 361585763f30..6ead6957b751 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -22,23 +22,23 @@ #include "bh.h" static const struct wfx_platform_data pdata_wf200 = { - .file_fw = "wfm_wf200", - .file_pds = "wf200.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/wf200.pds", }; static const struct wfx_platform_data pdata_brd4001a = { - .file_fw = "wfm_wf200", - .file_pds = "brd4001a.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/brd4001a.pds", }; static const struct wfx_platform_data pdata_brd8022a = { - .file_fw = "wfm_wf200", - .file_pds = "brd8022a.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/brd8022a.pds", }; static const struct wfx_platform_data pdata_brd8023a = { - .file_fw = "wfm_wf200", - .file_pds = "brd8023a.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/brd8023a.pds", }; /* Legacy DT don't use it */ diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c index 9aa52d76cdda..6b4f9fff8b44 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/staging/wfx/bus_spi.c @@ -24,26 +24,26 @@ #define SET_READ 0x8000 /* usage: or operation */ static const struct wfx_platform_data pdata_wf200 = { - .file_fw = "wfm_wf200", - .file_pds = "wf200.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/wf200.pds", .use_rising_clk = true, }; static const struct wfx_platform_data pdata_brd4001a = { - .file_fw = "wfm_wf200", - .file_pds = "brd4001a.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/brd4001a.pds", .use_rising_clk = true, }; static const struct wfx_platform_data pdata_brd8022a = { - .file_fw = "wfm_wf200", - .file_pds = "brd8022a.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/brd8022a.pds", .use_rising_clk = true, }; static const struct wfx_platform_data pdata_brd8023a = { - .file_fw = "wfm_wf200", - .file_pds = "brd8023a.pds", + .file_fw = "wfx/wfm_wf200", + .file_pds = "wfx/brd8023a.pds", .use_rising_clk = true, };