[29/31] staging: wfx: drop legacy compatible values

Commit Message

Jérôme Pouiller Jan. 13, 2022, 8:55 a.m. UTC

From: Jérôme Pouiller <[e-mail]>

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 <[e-mail]>
---
 .../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(-)

Patch

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)
 	 */