Commit 89273137 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman

staging: wfx: drop legacy compatible values

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: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20220113085524.1110708-30-Jerome.Pouiller@silabs.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ed63359
...@@ -64,8 +64,7 @@ properties: ...@@ -64,8 +64,7 @@ properties:
reset-gpios: reset-gpios:
description: (SPI only) Phandle of gpio that will be used to reset chip description: (SPI only) Phandle of gpio that will be used to reset chip
during probe. Without this property, you may encounter issues with warm during probe. Without this property, you may encounter issues with warm
boot. (For legacy purpose, the gpio in inverted when compatible == boot.
"silabs,wfx-spi")
For SDIO, the reset gpio should declared using a mmc-pwrseq. For SDIO, the reset gpio should declared using a mmc-pwrseq.
maxItems: 1 maxItems: 1
......
...@@ -41,12 +41,6 @@ static const struct wfx_platform_data pdata_brd8023a = { ...@@ -41,12 +41,6 @@ static const struct wfx_platform_data pdata_brd8023a = {
.file_pds = "wfx/brd8023a.pds", .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 wfx_sdio_priv {
struct sdio_func *func; struct sdio_func *func;
struct wfx_dev *core; struct wfx_dev *core;
...@@ -193,7 +187,6 @@ static const struct of_device_id wfx_sdio_of_match[] = { ...@@ -193,7 +187,6 @@ static const struct of_device_id wfx_sdio_of_match[] = {
{ .compatible = "silabs,brd4001a", .data = &pdata_brd4001a }, { .compatible = "silabs,brd4001a", .data = &pdata_brd4001a },
{ .compatible = "silabs,brd8022a", .data = &pdata_brd8022a }, { .compatible = "silabs,brd8022a", .data = &pdata_brd8022a },
{ .compatible = "silabs,brd8023a", .data = &pdata_brd8023a }, { .compatible = "silabs,brd8023a", .data = &pdata_brd8023a },
{ .compatible = "silabs,wfx-sdio", .data = &pdata_wfx_sdio },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, wfx_sdio_of_match); MODULE_DEVICE_TABLE(of, wfx_sdio_of_match);
......
...@@ -47,14 +47,6 @@ static const struct wfx_platform_data pdata_brd8023a = { ...@@ -47,14 +47,6 @@ static const struct wfx_platform_data pdata_brd8023a = {
.use_rising_clk = true, .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 wfx_spi_priv {
struct spi_device *func; struct spi_device *func;
struct wfx_dev *core; struct wfx_dev *core;
...@@ -237,8 +229,6 @@ static int wfx_spi_probe(struct spi_device *func) ...@@ -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"); dev_warn(&func->dev, "gpio reset is not defined, trying to load firmware anyway\n");
} else { } else {
gpiod_set_consumer_name(bus->gpio_reset, "wfx reset"); 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); gpiod_set_value_cansleep(bus->gpio_reset, 1);
usleep_range(100, 150); usleep_range(100, 150);
gpiod_set_value_cansleep(bus->gpio_reset, 0); gpiod_set_value_cansleep(bus->gpio_reset, 0);
...@@ -269,7 +259,6 @@ static const struct spi_device_id wfx_spi_id[] = { ...@@ -269,7 +259,6 @@ static const struct spi_device_id wfx_spi_id[] = {
{ "brd4001a", (kernel_ulong_t)&pdata_brd4001a }, { "brd4001a", (kernel_ulong_t)&pdata_brd4001a },
{ "brd8022a", (kernel_ulong_t)&pdata_brd8022a }, { "brd8022a", (kernel_ulong_t)&pdata_brd8022a },
{ "brd8023a", (kernel_ulong_t)&pdata_brd8023a }, { "brd8023a", (kernel_ulong_t)&pdata_brd8023a },
{ "wfx-spi", (kernel_ulong_t)&pdata_wfx_spi },
{ }, { },
}; };
MODULE_DEVICE_TABLE(spi, wfx_spi_id); MODULE_DEVICE_TABLE(spi, wfx_spi_id);
...@@ -280,7 +269,6 @@ static const struct of_device_id wfx_spi_of_match[] = { ...@@ -280,7 +269,6 @@ static const struct of_device_id wfx_spi_of_match[] = {
{ .compatible = "silabs,brd4001a" }, { .compatible = "silabs,brd4001a" },
{ .compatible = "silabs,brd8022a" }, { .compatible = "silabs,brd8022a" },
{ .compatible = "silabs,brd8023a" }, { .compatible = "silabs,brd8023a" },
{ .compatible = "silabs,wfx-spi" },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, wfx_spi_of_match); MODULE_DEVICE_TABLE(of, wfx_spi_of_match);
......
...@@ -23,7 +23,6 @@ struct wfx_platform_data { ...@@ -23,7 +23,6 @@ struct wfx_platform_data {
const char *file_fw; const char *file_fw;
const char *file_pds; const char *file_pds;
struct gpio_desc *gpio_wakeup; 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 /* if true HIF D_out is sampled on the rising edge of the clock (intended to be used in
* 50Mhz SDIO) * 50Mhz SDIO)
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment