Commit 3c83dd57 authored by Tony Lindgren's avatar Tony Lindgren Committed by Kalle Valo

wlcore: Add support for optional wakeirq

Now with wlcore using PM runtime, we can also add support for Linux
generic wakeirq handling for it if configured in the dts file.

The wakeirq can be configured as the second interrupt in the dts file
with interrupts-extended property where it is the padconf irq of the OOB
GPIO pin used for wlcore interrupt.

Note that eventually we should also allow configuring wlcore to use the
SDIO dat1 IRQ for wake-up, and in that case the the wakeirq should be
configured to be the padconf interrupt of the dat1 pin and not the
padconf interrupt of the OOB GPIO pin.

Cc: Eyal Reizer <eyalr@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4e651bad
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/pm_wakeirq.h>
#include "wlcore.h" #include "wlcore.h"
#include "debug.h" #include "debug.h"
...@@ -6627,13 +6628,25 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) ...@@ -6627,13 +6628,25 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
device_init_wakeup(wl->dev, true);
ret = enable_irq_wake(wl->irq); ret = enable_irq_wake(wl->irq);
if (!ret) { if (!ret) {
wl->irq_wake_enabled = true; wl->irq_wake_enabled = true;
device_init_wakeup(wl->dev, 1);
if (pdev_data->pwr_in_suspend) if (pdev_data->pwr_in_suspend)
wl->hw->wiphy->wowlan = &wlcore_wowlan_support; wl->hw->wiphy->wowlan = &wlcore_wowlan_support;
} }
res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
if (res) {
wl->wakeirq = res->start;
wl->wakeirq_flags = res->flags & IRQF_TRIGGER_MASK;
ret = dev_pm_set_dedicated_wake_irq(wl->dev, wl->wakeirq);
if (ret)
wl->wakeirq = -ENODEV;
} else {
wl->wakeirq = -ENODEV;
}
#endif #endif
disable_irq(wl->irq); disable_irq(wl->irq);
wl1271_power_off(wl); wl1271_power_off(wl);
...@@ -6661,6 +6674,9 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) ...@@ -6661,6 +6674,9 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context)
wl1271_unregister_hw(wl); wl1271_unregister_hw(wl);
out_irq: out_irq:
if (wl->wakeirq >= 0)
dev_pm_clear_wake_irq(wl->dev);
device_init_wakeup(wl->dev, false);
free_irq(wl->irq, wl); free_irq(wl->irq, wl);
out_free_nvs: out_free_nvs:
...@@ -6825,10 +6841,16 @@ int wlcore_remove(struct platform_device *pdev) ...@@ -6825,10 +6841,16 @@ int wlcore_remove(struct platform_device *pdev)
if (!wl->initialized) if (!wl->initialized)
return 0; return 0;
if (wl->irq_wake_enabled) { if (wl->wakeirq >= 0) {
device_init_wakeup(wl->dev, 0); dev_pm_clear_wake_irq(wl->dev);
disable_irq_wake(wl->irq); wl->wakeirq = -ENODEV;
} }
device_init_wakeup(wl->dev, false);
if (wl->irq_wake_enabled)
disable_irq_wake(wl->irq);
wl1271_unregister_hw(wl); wl1271_unregister_hw(wl);
pm_runtime_put_sync(wl->dev); pm_runtime_put_sync(wl->dev);
......
...@@ -241,7 +241,7 @@ static const struct of_device_id wlcore_sdio_of_match_table[] = { ...@@ -241,7 +241,7 @@ static const struct of_device_id wlcore_sdio_of_match_table[] = {
{ } { }
}; };
static int wlcore_probe_of(struct device *dev, int *irq, static int wlcore_probe_of(struct device *dev, int *irq, int *wakeirq,
struct wlcore_platdev_data *pdev_data) struct wlcore_platdev_data *pdev_data)
{ {
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
...@@ -259,6 +259,8 @@ static int wlcore_probe_of(struct device *dev, int *irq, ...@@ -259,6 +259,8 @@ static int wlcore_probe_of(struct device *dev, int *irq,
return -EINVAL; return -EINVAL;
} }
*wakeirq = irq_of_parse_and_map(np, 1);
/* optional clock frequency params */ /* optional clock frequency params */
of_property_read_u32(np, "ref-clock-frequency", of_property_read_u32(np, "ref-clock-frequency",
&pdev_data->ref_clock_freq); &pdev_data->ref_clock_freq);
...@@ -268,7 +270,7 @@ static int wlcore_probe_of(struct device *dev, int *irq, ...@@ -268,7 +270,7 @@ static int wlcore_probe_of(struct device *dev, int *irq,
return 0; return 0;
} }
#else #else
static int wlcore_probe_of(struct device *dev, int *irq, static int wlcore_probe_of(struct device *dev, int *irq, int *wakeirq,
struct wlcore_platdev_data *pdev_data) struct wlcore_platdev_data *pdev_data)
{ {
return -ENODATA; return -ENODATA;
...@@ -280,10 +282,10 @@ static int wl1271_probe(struct sdio_func *func, ...@@ -280,10 +282,10 @@ static int wl1271_probe(struct sdio_func *func,
{ {
struct wlcore_platdev_data *pdev_data; struct wlcore_platdev_data *pdev_data;
struct wl12xx_sdio_glue *glue; struct wl12xx_sdio_glue *glue;
struct resource res[1]; struct resource res[2];
mmc_pm_flag_t mmcflags; mmc_pm_flag_t mmcflags;
int ret = -ENOMEM; int ret = -ENOMEM;
int irq; int irq, wakeirq;
const char *chip_family; const char *chip_family;
/* We are only able to handle the wlan function */ /* We are only able to handle the wlan function */
...@@ -308,7 +310,7 @@ static int wl1271_probe(struct sdio_func *func, ...@@ -308,7 +310,7 @@ static int wl1271_probe(struct sdio_func *func,
/* Use block mode for transferring over one block size of data */ /* Use block mode for transferring over one block size of data */
func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE; func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
ret = wlcore_probe_of(&func->dev, &irq, pdev_data); ret = wlcore_probe_of(&func->dev, &irq, &wakeirq, pdev_data);
if (ret) if (ret)
goto out; goto out;
...@@ -351,6 +353,11 @@ static int wl1271_probe(struct sdio_func *func, ...@@ -351,6 +353,11 @@ static int wl1271_probe(struct sdio_func *func,
irqd_get_trigger_type(irq_get_irq_data(irq)); irqd_get_trigger_type(irq_get_irq_data(irq));
res[0].name = "irq"; res[0].name = "irq";
res[1].start = wakeirq;
res[1].flags = IORESOURCE_IRQ |
irqd_get_trigger_type(irq_get_irq_data(wakeirq));
res[1].name = "wakeirq";
ret = platform_device_add_resources(glue->core, res, ARRAY_SIZE(res)); ret = platform_device_add_resources(glue->core, res, ARRAY_SIZE(res));
if (ret) { if (ret) {
dev_err(glue->dev, "can't add resources\n"); dev_err(glue->dev, "can't add resources\n");
......
...@@ -199,8 +199,10 @@ struct wl1271 { ...@@ -199,8 +199,10 @@ struct wl1271 {
struct wl1271_if_operations *if_ops; struct wl1271_if_operations *if_ops;
int irq; int irq;
int wakeirq;
int irq_flags; int irq_flags;
int wakeirq_flags;
spinlock_t wl_lock; spinlock_t wl_lock;
......
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