|
@@ -17,7 +17,6 @@
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
*/
|
|
|
|
|
|
-#include <linux/clk.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/of.h>
|
|
|
#include <linux/platform_device.h>
|
|
@@ -78,16 +77,14 @@ struct intc_irqpin_priv {
|
|
|
struct platform_device *pdev;
|
|
|
struct irq_chip irq_chip;
|
|
|
struct irq_domain *irq_domain;
|
|
|
- struct clk *clk;
|
|
|
+ atomic_t wakeup_path;
|
|
|
unsigned shared_irqs:1;
|
|
|
- unsigned needs_clk:1;
|
|
|
u8 shared_irq_mask;
|
|
|
};
|
|
|
|
|
|
struct intc_irqpin_config {
|
|
|
unsigned int irlm_bit;
|
|
|
unsigned needs_irlm:1;
|
|
|
- unsigned needs_clk:1;
|
|
|
};
|
|
|
|
|
|
static unsigned long intc_irqpin_read32(void __iomem *iomem)
|
|
@@ -287,14 +284,10 @@ static int intc_irqpin_irq_set_wake(struct irq_data *d, unsigned int on)
|
|
|
int hw_irq = irqd_to_hwirq(d);
|
|
|
|
|
|
irq_set_irq_wake(p->irq[hw_irq].requested_irq, on);
|
|
|
-
|
|
|
- if (!p->clk)
|
|
|
- return 0;
|
|
|
-
|
|
|
if (on)
|
|
|
- clk_enable(p->clk);
|
|
|
+ atomic_inc(&p->wakeup_path);
|
|
|
else
|
|
|
- clk_disable(p->clk);
|
|
|
+ atomic_dec(&p->wakeup_path);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -369,12 +362,10 @@ static const struct irq_domain_ops intc_irqpin_irq_domain_ops = {
|
|
|
static const struct intc_irqpin_config intc_irqpin_irlm_r8a777x = {
|
|
|
.irlm_bit = 23, /* ICR0.IRLM0 */
|
|
|
.needs_irlm = 1,
|
|
|
- .needs_clk = 0,
|
|
|
};
|
|
|
|
|
|
static const struct intc_irqpin_config intc_irqpin_rmobile = {
|
|
|
.needs_irlm = 0,
|
|
|
- .needs_clk = 1,
|
|
|
};
|
|
|
|
|
|
static const struct of_device_id intc_irqpin_dt_ids[] = {
|
|
@@ -426,18 +417,6 @@ static int intc_irqpin_probe(struct platform_device *pdev)
|
|
|
platform_set_drvdata(pdev, p);
|
|
|
|
|
|
config = of_device_get_match_data(dev);
|
|
|
- if (config)
|
|
|
- p->needs_clk = config->needs_clk;
|
|
|
-
|
|
|
- p->clk = devm_clk_get(dev, NULL);
|
|
|
- if (IS_ERR(p->clk)) {
|
|
|
- if (p->needs_clk) {
|
|
|
- dev_err(dev, "unable to get clock\n");
|
|
|
- ret = PTR_ERR(p->clk);
|
|
|
- goto err0;
|
|
|
- }
|
|
|
- p->clk = NULL;
|
|
|
- }
|
|
|
|
|
|
pm_runtime_enable(dev);
|
|
|
pm_runtime_get_sync(dev);
|
|
@@ -606,12 +585,25 @@ static int intc_irqpin_remove(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int __maybe_unused intc_irqpin_suspend(struct device *dev)
|
|
|
+{
|
|
|
+ struct intc_irqpin_priv *p = dev_get_drvdata(dev);
|
|
|
+
|
|
|
+ if (atomic_read(&p->wakeup_path))
|
|
|
+ device_set_wakeup_path(dev);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static SIMPLE_DEV_PM_OPS(intc_irqpin_pm_ops, intc_irqpin_suspend, NULL);
|
|
|
+
|
|
|
static struct platform_driver intc_irqpin_device_driver = {
|
|
|
.probe = intc_irqpin_probe,
|
|
|
.remove = intc_irqpin_remove,
|
|
|
.driver = {
|
|
|
.name = "renesas_intc_irqpin",
|
|
|
.of_match_table = intc_irqpin_dt_ids,
|
|
|
+ .pm = &intc_irqpin_pm_ops,
|
|
|
}
|
|
|
};
|
|
|
|