From patchwork Thu Jan 13 08:55:22 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: 12712481 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 F1ACCC433F5 for ; Thu, 13 Jan 2022 08:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233609AbiAMI6y (ORCPT ); Thu, 13 Jan 2022 03:58:54 -0500 Received: from mail-dm6nam11on2073.outbound.protection.outlook.com ([40.107.223.73]:16221 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233351AbiAMI6O (ORCPT ); Thu, 13 Jan 2022 03:58:14 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UfaoJMFSWHJbC4Dgoq3vfbCdEKaSPs7G+r2X0IfFPkWGnYVVHG7Juy6Niayc7vKL63JjwVbH9SrGNqTTCb/YNBN34gl67DnQ+U4UG+sz9y7gt1FetpaMS+MlbMPJueFccu6oKaTqoduuA8bo4QrCDX73e9UJfw1phb6+n3+vFsRJqYYu9t6Y+y1Ua2aCHTznxIBY2LPgBj398xFSukIbHVvLlSf8b3sh/fDcNFysErksjxKwzKUuNGdEbey9/1CDkgNipVQGMBFlTW0h2tOieihoXZWkf66EFi/rM+c0tZ/oXP9KU9c6myhKT7Rac4NBaCFub8+7JoyKgJf8JwdYuw== 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=CraUO1EHQRox2TGQiIRnhpiB+IZaBNVOt3+Jn+Afr2c=; b=egiOM84+r9ds1R+BxvznOVmQBAFJBYSZewXT1EhM4pHN3zAMGigTKmqUugf6/DEbHhhq7sijJzPpmBI2xRkTtrJhewBaxgk4ytDL6N9CVwwA/R8rl8HPi8S+AwTwX4GakGpVAdURZtMrI1iHFy/T5eEyUkk3UYUxhhD3l/R0LgnyBChYRkRXk3j6guh9MbO2V+9HC8Ub/USt6zY5L/H8bRs3qZH+agyXmjSHdc++nV7/bIqfkTSjp8XMvbgqX+VmgEjrmP8pYoEqFyxJiXrTdIlTPPE3Mf0l3sU4XkRQDvBVJxuPIgCYGY+IpcbCDevDsc8f/Nx2i+6NRxcbae5r7Q== 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=CraUO1EHQRox2TGQiIRnhpiB+IZaBNVOt3+Jn+Afr2c=; b=g1iPfIEYMOg6zPg/Ap5PWhY7fYcV4uUvnKa1kMQ2Xq4pVTxYfkGnCc/8eGtwigY/i+Ie0I9ZTRV6Ax3UPFmvkN7hlM7N70qbVDCr8d/m+/JE/dt/y08c5DsWYkQCM7LEoZyxPyThT1tSlCutyuf34aCi7MoHW0QOeuT7RUL1ZW0= 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:36 +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:36 +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 29/31] staging: wfx: drop legacy compatible values Date: Thu, 13 Jan 2022 09:55:22 +0100 Message-Id: <20220113085524.1110708-30-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: dafbfa3a-73c7-4008-0fb8-08d9d6729afb X-MS-TrafficTypeDiagnostic: CY4PR1101MB2071:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 78oo6fJbxkc/VtNSaRqmaSRvJ6I0lwMRhdRP4UKXNA/uj3YrNEUe+yHkD2OwxhilKf+mbJmhTQKHg4Dfp4kYJ5rhZ8nsHHx7ydzm5Xr5taYXbwMwBlaizq8ACblVxGKG018/7adce6uvALSJNWYVPAkJZSGOqeidaljHaeGPJy/5N+Pq7sgwZLbSQzxKEYGpfd8L6F39Stx57U/VXF5bcl77gHgHtvOe85f2dDf9EQ7RANvQjw2GvXm9BJv6FLeW9OUfWOBpyVY3CNEQCehgpwrUm6F0x7i5CqMzQgr3jrSIzzxkQXd0ONM+6D1z4E6M1+4vsfWpuVHPT41NIhv6a5/oC2X4rvici2G2wsmpOS/Oo5anC9cTZx80kuN2ZU77qJDxVvX3O96SWu2WtZ59q3pnCdw9LbHCRGwkLMNU8KYO9+1yy046qVfOHbhqxU3qMsyEL3S+B9MO5VIJ8FdcrPFkGKnBEpf+EBk/zixzsRPBxEuvF/Rfr8FdoaKGL/QWPFzxK9axQEfWXNTfmN+HcAGTD3CQvxn2v8Icv2dYPtf+mI+x4uA+dmQKldzdy0L8e3VYACNhL6QF70Kd7ywlxSbRbAU3nvyeNVKqVMi2/d7cAI7Usu0p85bhkMmAFRwq+awpmxqnkUZ+uVpVzQmvAw== 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?0zciDY/P2wnsMy7fJiYWnn9Of/6Z?= =?utf-8?q?IDOJuRyHNZlFyEIX8w3wsJ3AsazrUGpXmCvZQwhi1n7lQ0ec0bDSdPYwWO3bO26rM?= =?utf-8?q?QPw8I8ry3noglfb581AU+UIhfSakk6NlC1TN9Y0QGkfDY64NymUUY029X97TITMwX?= =?utf-8?q?dywJTNluD/heuXgDuD3XyIMuW4kQBNOwB0M8sHcWzKbQkooYz9HDakLWj0y8/AIji?= =?utf-8?q?palxi4W7BrLgYQiZag7g2DmDWtdXsARIEzllvHWy9Q37RrWi+awGy7nJAANv+1gKq?= =?utf-8?q?g5oqeeRJVMKdY7iguxmG+m/joyDCAY8Ho2PGnriy/iGu+0cl3ttAk5qhgpRbGfdus?= =?utf-8?q?+pH1oIkZ1+i3Rgp9a0lt2ZbI6kcVjEJN/Z9TCs0y7dHrHkc3oPs0GOH9628IzaD8x?= =?utf-8?q?UC35JiSgwVbPSOuNLJDBjS6StM3WyI70hCrkSXYitN8F6DQwz8nvZRQUT6vpSlGXu?= =?utf-8?q?Mn/yA3C/iUtLbdPLvt72CJ66ZSeBiQ44DoqMpfk1vl15cXN5Sjkvb4ekY8rEOtj2v?= =?utf-8?q?n5egFzrzOftaI9s/SOkvtHbnqwzb5zNKNZ3puXAAKpeFNIQBzsdstahHXt9gZYvaf?= =?utf-8?q?Hxf0DETSOHj4vKWFjlVnP5pqUyz4ZrWMLXpS+Dn/d73CbZAtIr0H0c1acYGdmWTOX?= =?utf-8?q?27k/LTkIpk75icYozC4yxQ60I3sQkf4VjVaKCp0Nb2NbKpUWAHPng3qMDs+cI3CRZ?= =?utf-8?q?e/oxoWw52GE6g/aAcDQwDSVbBJ4vTLh0cOeH3QQrKOsaH8keNpcrVG+M41UNEkfua?= =?utf-8?q?vlKNCj/kyg+tJPRbROqZTX8GCU014SvUW57aYDYx8FWln6R9rSkqV7nh+fAL8ovvm?= =?utf-8?q?c+dG1YqYi56ppj2qKfSGOvhnv8yVd8q1Tu+d+yPjNH5Nk82klBtFTVWKi7qEJOjO3?= =?utf-8?q?zcECkplRXclQF8hJHFIieQsb4+Y3tTH7HTtlt3PfMV9wAZd4PGTfGhzLvrcO0C9HG?= =?utf-8?q?fdqjY4AHE/4Y1q60F0Aq3fHHK/7/jmfJPaaIyAKLi9xW+boC0d5SKUmzOKfCsy88j?= =?utf-8?q?1WbiflcPV78ZWNls9rcIwQlWockx0NGwkAsdCJG2LPvXb/5tMhedUcTS0AF17MsS9?= =?utf-8?q?bRhxVNjGmmiw3VwVGhR4iqBq1wIiu0GWPt15bZEKLhmgpAO2VeQOXbdcYUHI3ivCE?= =?utf-8?q?IK5Z6beXCSUB964pYFXny92d0i9gzg3MQ9/uwFTcLLGTYPCKoXDPQAk36Yt0aWfrg?= =?utf-8?q?3CuMQl/CANOz/yF8H/PwOmSF+ALkgI6P9VJ0S0+KBpNbTPmeFGv42vddqwyS53WzP?= =?utf-8?q?2IrIM8qtVFRw74VnEIQoOD4BYVWc6QuxOgU+x/7B5Gxf1qaSK+kfMu7PZ1EhcYCwS?= =?utf-8?q?ceV/RonBkHG/Vp0tkDXjHIS+Zh1jGaYBaI54ORyZATtNJ2nwL2ziCgtXpazNPUGLC?= =?utf-8?q?xSP2f+MZwUoGdUzM49e2jcRg/DV0wj7521y7yBprQho6p5dkyfoTXWR4ORdIBxpA7?= =?utf-8?q?Dl5ER573pbAyJPz+T7WrWQFK2wnUlvBpEavlqyZZ96HQMbMycSwK1P1/KULrlHRgP?= =?utf-8?q?gonI1xsR/mLJCBnN/6nF6Zq4yAK5ARTBs0SMKt6lhGOiI5EKITxNxybljRr+4ECcJ?= =?utf-8?q?800EMDoy3PoC1O0tca2wtXISizMOmAOsNPRtnf4B865KQ6WxClngUo=3D?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: dafbfa3a-73c7-4008-0fb8-08d9d6729afb 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:36.6739 (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: mAsWkyZLmdqdOQ09ZMEosmMPB+HGu9H22g2Dff96VU1jICb8KkalFFG/Oc6mIF/dUS879buUyQx4dsLqHsXdjQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2071 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Jérôme Pouiller Values "silabs,wfx-sdio" and "silabs,wfx-spi" are deprecated for a while now. We take advantage of getting out of the staging tree to drop them and start from a blank sheet. Signed-off-by: Jérôme Pouiller --- .../devicetree/bindings/net/wireless/silabs,wfx.yaml | 3 +-- drivers/staging/wfx/bus_sdio.c | 7 ------- drivers/staging/wfx/bus_spi.c | 12 ------------ drivers/staging/wfx/main.h | 1 - 4 files changed, 1 insertion(+), 22 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 44aeba0f7276..c12be18eb6ac 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 @@ -64,8 +64,7 @@ properties: 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 - boot. (For legacy purpose, the gpio in inverted when compatible == - "silabs,wfx-spi") + boot. For SDIO, the reset gpio should declared using a mmc-pwrseq. maxItems: 1 diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c index 6ead6957b751..6ea573221ab1 100644 --- a/drivers/staging/wfx/bus_sdio.c +++ b/drivers/staging/wfx/bus_sdio.c @@ -41,12 +41,6 @@ static const struct wfx_platform_data pdata_brd8023a = { .file_pds = "wfx/brd8023a.pds", }; -/* Legacy DT don't use it */ -static const struct wfx_platform_data pdata_wfx_sdio = { - .file_fw = "wfm_wf200", - .file_pds = "wf200.pds", -}; - struct wfx_sdio_priv { struct sdio_func *func; struct wfx_dev *core; @@ -193,7 +187,6 @@ static const struct of_device_id wfx_sdio_of_match[] = { { .compatible = "silabs,brd4001a", .data = &pdata_brd4001a }, { .compatible = "silabs,brd8022a", .data = &pdata_brd8022a }, { .compatible = "silabs,brd8023a", .data = &pdata_brd8023a }, - { .compatible = "silabs,wfx-sdio", .data = &pdata_wfx_sdio }, { }, }; MODULE_DEVICE_TABLE(of, wfx_sdio_of_match); diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c index 6b4f9fff8b44..062826aa7e6c 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/staging/wfx/bus_spi.c @@ -47,14 +47,6 @@ static const struct wfx_platform_data pdata_brd8023a = { .use_rising_clk = true, }; -/* Legacy DT don't use it */ -static const struct wfx_platform_data pdata_wfx_spi = { - .file_fw = "wfm_wf200", - .file_pds = "wf200.pds", - .use_rising_clk = true, - .reset_inverted = true, -}; - struct wfx_spi_priv { struct spi_device *func; struct wfx_dev *core; @@ -237,8 +229,6 @@ static int wfx_spi_probe(struct spi_device *func) dev_warn(&func->dev, "gpio reset is not defined, trying to load firmware anyway\n"); } else { gpiod_set_consumer_name(bus->gpio_reset, "wfx reset"); - if (pdata->reset_inverted) - gpiod_toggle_active_low(bus->gpio_reset); gpiod_set_value_cansleep(bus->gpio_reset, 1); usleep_range(100, 150); gpiod_set_value_cansleep(bus->gpio_reset, 0); @@ -269,7 +259,6 @@ static const struct spi_device_id wfx_spi_id[] = { { "brd4001a", (kernel_ulong_t)&pdata_brd4001a }, { "brd8022a", (kernel_ulong_t)&pdata_brd8022a }, { "brd8023a", (kernel_ulong_t)&pdata_brd8023a }, - { "wfx-spi", (kernel_ulong_t)&pdata_wfx_spi }, { }, }; MODULE_DEVICE_TABLE(spi, wfx_spi_id); @@ -280,7 +269,6 @@ static const struct of_device_id wfx_spi_of_match[] = { { .compatible = "silabs,brd4001a" }, { .compatible = "silabs,brd8022a" }, { .compatible = "silabs,brd8023a" }, - { .compatible = "silabs,wfx-spi" }, { }, }; MODULE_DEVICE_TABLE(of, wfx_spi_of_match); diff --git a/drivers/staging/wfx/main.h b/drivers/staging/wfx/main.h index fcd26b24519e..68c665307153 100644 --- a/drivers/staging/wfx/main.h +++ b/drivers/staging/wfx/main.h @@ -23,7 +23,6 @@ struct wfx_platform_data { const char *file_fw; const char *file_pds; struct gpio_desc *gpio_wakeup; - bool reset_inverted; /* if true HIF D_out is sampled on the rising edge of the clock (intended to be used in * 50Mhz SDIO) */