[PATCH wireless-next 09/10] wifi: cw1200: add XR819 SDIO support
From: Arthur Heymans
Date: Thu Nov 19 2026 - 12:50:38 EST
Match SDIO ID 0020:2281 and use the XR819 download path. Reset the
card on probe: disabling the function leaves the host interface in
queue mode, and a second firmware download fails without the reset.
Use the board MAC address and GPIO interrupt when provided. Otherwise
use the SDIO interrupt.
Prepared with OpenAI Codex.
Signed-off-by: Arthur Heymans <arthur@xxxxxxxxxxxx>
---
drivers/net/wireless/st/cw1200/Kconfig | 6 +-
drivers/net/wireless/st/cw1200/cw1200_sdio.c | 123 +++++++++++++++----
include/linux/mmc/sdio_ids.h | 1 +
3 files changed, 107 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/st/cw1200/Kconfig b/drivers/net/wireless/st/cw1200/Kconfig
index 03575e9894bb..8c2f759d8bd8 100644
--- a/drivers/net/wireless/st/cw1200/Kconfig
+++ b/drivers/net/wireless/st/cw1200/Kconfig
@@ -3,7 +3,8 @@ config CW1200
tristate "CW1200 WLAN support"
depends on MAC80211 && CFG80211
help
- This is a driver for the ST-E CW1100 & CW1200 WLAN chipsets.
+ This is a driver for the ST-E CW1100, CW1200 and XRadio XR819
+ WLAN chipsets.
This option just enables the driver core, see below for
specific bus support.
@@ -13,7 +14,8 @@ config CW1200_WLAN_SDIO
tristate "Support SDIO platforms"
depends on CW1200 && MMC
help
- Enable support for the CW1200 connected via an SDIO bus.
+ Enable support for CW1200-family devices connected via an SDIO bus,
+ including the XRadio XR819.
By default this driver only supports the Sagrad SG901-1091/1098 EVK
and similar designs that utilize a hardware reset circuit. To
support different CW1200 SDIO designs you will need to override
diff --git a/drivers/net/wireless/st/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c
index 4f4bd668ebd2..330a4d0946bc 100644
--- a/drivers/net/wireless/st/cw1200/cw1200_sdio.c
+++ b/drivers/net/wireless/st/cw1200/cw1200_sdio.c
@@ -18,6 +18,9 @@
#include <linux/mmc/card.h>
#include <linux/mmc/sdio.h>
#include <linux/mmc/sdio_ids.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_net.h>
#include <net/mac80211.h>
#include "cw1200.h"
@@ -50,14 +53,28 @@ struct hwbus_priv {
struct sdio_func *func;
struct cw1200_common *core;
const struct cw1200_platform_data_sdio *pdata;
+ struct cw1200_platform_data_sdio pdata_storage;
+ u8 macaddr[ETH_ALEN];
+ bool is_xr819;
};
static const struct sdio_device_id cw1200_sdio_ids[] = {
{ SDIO_DEVICE(SDIO_VENDOR_ID_STE, SDIO_DEVICE_ID_STE_CW1200) },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_STE, SDIO_DEVICE_ID_STE_XR819) },
{ /* end: all zeroes */ },
};
MODULE_DEVICE_TABLE(sdio, cw1200_sdio_ids);
+static const struct of_device_id cw1200_sdio_of_match[] = {
+ { .compatible = "xradio,xr819" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, cw1200_sdio_of_match);
+
+MODULE_FIRMWARE("xr819/boot_xr819.bin");
+MODULE_FIRMWARE("xr819/fw_xr819.bin");
+MODULE_FIRMWARE("xr819/sdd_xr819.bin");
+
/* hwbus_ops implemetation */
static int cw1200_sdio_memcpy_fromio(struct hwbus_priv *self,
@@ -142,6 +159,7 @@ static irqreturn_t cw1200_gpio_irq(int irq, void *dev_id)
static int cw1200_request_irq(struct hwbus_priv *self)
{
+ unsigned long trigger = irq_get_trigger_type(self->pdata->irq);
int ret;
int err;
u8 ien;
@@ -160,10 +178,10 @@ static int cw1200_request_irq(struct hwbus_priv *self)
goto restore_ien;
/* Request the IRQ */
- ret = request_threaded_irq(self->pdata->irq, cw1200_gpio_hardirq,
- cw1200_gpio_irq,
- IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
- "cw1200_wlan_irq", self);
+ ret = request_threaded_irq(self->pdata->irq, cw1200_gpio_hardirq,
+ cw1200_gpio_irq, IRQF_ONESHOT |
+ (trigger ?: IRQF_TRIGGER_HIGH),
+ "cw1200_wlan_irq", self);
if (!ret)
return 0;
@@ -303,11 +321,28 @@ static const struct hwbus_ops cw1200_sdio_hwbus_ops = {
.power_mgmt = cw1200_sdio_pm,
};
+static int cw1200_sdio_core_probe(struct hwbus_priv *self,
+ struct sdio_func *func)
+{
+ if (self->is_xr819)
+ return cw1200_core_probe_xr819(&cw1200_sdio_hwbus_ops, self,
+ &func->dev, &self->core,
+ self->pdata->ref_clk,
+ self->pdata->macaddr,
+ self->pdata->sdd_file);
+
+ return cw1200_core_probe(&cw1200_sdio_hwbus_ops, self, &func->dev,
+ &self->core, self->pdata->ref_clk,
+ self->pdata->macaddr, self->pdata->sdd_file,
+ self->pdata->have_5ghz);
+}
+
/* Probe Function to be called by SDIO stack when device is discovered */
static int cw1200_sdio_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
struct hwbus_priv *self;
+ int irq;
int status;
pr_info("cw1200_wlan_sdio: Probe called\n");
@@ -324,30 +359,75 @@ static int cw1200_sdio_probe(struct sdio_func *func,
func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
- self->pdata = global_plat_data; /* FIXME */
+ self->pdata_storage = *global_plat_data;
+ self->pdata = &self->pdata_storage;
+ self->is_xr819 = id->device == SDIO_DEVICE_ID_STE_XR819;
+ if (self->is_xr819) {
+ func->card->quirks |= MMC_QUIRK_BROKEN_BYTE_MODE_512;
+ self->pdata_storage.ref_clk = 24000;
+ self->pdata_storage.have_5ghz = false;
+ self->pdata_storage.sdd_file = "xr819/sdd_xr819.bin";
+
+ if (of_property_present(func->dev.of_node, "interrupts") ||
+ of_property_present(func->dev.of_node, "interrupts-extended")) {
+ irq = of_irq_get(func->dev.of_node, 0);
+ if (irq <= 0) {
+ status = dev_err_probe(&func->dev, irq ?: -EINVAL,
+ "cannot map GPIO interrupt\n");
+ goto free_self;
+ }
+ self->pdata_storage.irq = irq;
+ }
+
+ status = of_get_mac_address(func->dev.of_node, self->macaddr);
+ if (status == -EPROBE_DEFER)
+ goto free_self;
+ if (!status)
+ self->pdata_storage.macaddr = self->macaddr;
+ }
self->func = func;
+ if (self->is_xr819) {
+ /* Disabling the function leaves the HIF in queue mode. Reset
+ * the single-function XR819 before starting another download.
+ */
+ sdio_claim_host(func);
+ status = mmc_hw_reset(func->card);
+ sdio_release_host(func);
+ if (status)
+ goto free_self;
+ }
sdio_set_drvdata(func, self);
sdio_claim_host(func);
- sdio_enable_func(func);
+ status = sdio_enable_func(func);
sdio_release_host(func);
+ if (status)
+ goto clear_drvdata;
- status = cw1200_sdio_irq_subscribe(self);
-
- status = cw1200_core_probe(&cw1200_sdio_hwbus_ops,
- self, &func->dev, &self->core,
- self->pdata->ref_clk,
- self->pdata->macaddr,
- self->pdata->sdd_file,
- self->pdata->have_5ghz);
- if (status) {
- cw1200_sdio_irq_unsubscribe(self);
+ if (self->is_xr819) {
sdio_claim_host(func);
- sdio_disable_func(func);
+ status = sdio_set_block_size(func, SDIO_BLOCK_SIZE);
sdio_release_host(func);
- sdio_set_drvdata(func, NULL);
- kfree(self);
+ if (status)
+ goto disable_func;
}
+ status = cw1200_sdio_irq_subscribe(self);
+ if (status)
+ goto disable_func;
+
+ status = cw1200_sdio_core_probe(self, func);
+ if (!status)
+ return 0;
+
+ cw1200_sdio_irq_unsubscribe(self);
+disable_func:
+ sdio_claim_host(func);
+ sdio_disable_func(func);
+ sdio_release_host(func);
+clear_drvdata:
+ sdio_set_drvdata(func, NULL);
+free_self:
+ kfree(self);
return status;
}
@@ -408,11 +488,12 @@ static struct sdio_driver sdio_driver = {
.id_table = cw1200_sdio_ids,
.probe = cw1200_sdio_probe,
.remove = cw1200_sdio_disconnect,
-#ifdef CONFIG_PM
.drv = {
+#ifdef CONFIG_PM
.pm = &cw1200_pm_ops,
- }
#endif
+ .of_match_table = cw1200_sdio_of_match,
+ },
};
/* Init Module function -> Called by insmod */
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index dfffda3d8002..35789be747a5 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -27,6 +27,7 @@
#define SDIO_VENDOR_ID_STE 0x0020
#define SDIO_DEVICE_ID_STE_CW1200 0x2280
+#define SDIO_DEVICE_ID_STE_XR819 0x2281
#define SDIO_VENDOR_ID_INTEL 0x0089
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
--
2.56.0