]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
mfd: sprd: Add wakeup capability for PMIC IRQ
authorBaolin Wang <baolin.wang7@gmail.com>
Tue, 18 Aug 2020 03:41:58 +0000 (11:41 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Thu, 10 Dec 2020 11:06:27 +0000 (12:06 +0100)
BugLink: https://bugs.launchpad.net/bugs/1905618
commit a75bfc824a2d33f57ebdc003bfe6b7a9e11e9cb9 upstream.

When changing to use suspend-to-idle to save power, the PMIC irq can not
wakeup the system due to lack of wakeup capability, which will cause
the sub-irqs (such as power key) of the PMIC can not wake up the system.
Thus we can add the wakeup capability for PMIC irq to solve this issue,
as well as removing the IRQF_NO_SUSPEND flag to allow PMIC irq to be
a wakeup source.

Reported-by: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
Tested-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/mfd/sprd-sc27xx-spi.c

index c0529a1cd5ea039b7cd40e014a1d1eb26d1d6271..20529ff48f0021ba8481e9839882c3208cb7b0eb 100644 (file)
@@ -204,7 +204,7 @@ static int sprd_pmic_probe(struct spi_device *spi)
        }
 
        ret = devm_regmap_add_irq_chip(&spi->dev, ddata->regmap, ddata->irq,
-                                      IRQF_ONESHOT | IRQF_NO_SUSPEND, 0,
+                                      IRQF_ONESHOT, 0,
                                       &ddata->irq_chip, &ddata->irq_data);
        if (ret) {
                dev_err(&spi->dev, "Failed to add PMIC irq chip %d\n", ret);
@@ -220,9 +220,34 @@ static int sprd_pmic_probe(struct spi_device *spi)
                return ret;
        }
 
+       device_init_wakeup(&spi->dev, true);
        return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int sprd_pmic_suspend(struct device *dev)
+{
+       struct sprd_pmic *ddata = dev_get_drvdata(dev);
+
+       if (device_may_wakeup(dev))
+               enable_irq_wake(ddata->irq);
+
+       return 0;
+}
+
+static int sprd_pmic_resume(struct device *dev)
+{
+       struct sprd_pmic *ddata = dev_get_drvdata(dev);
+
+       if (device_may_wakeup(dev))
+               disable_irq_wake(ddata->irq);
+
+       return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(sprd_pmic_pm_ops, sprd_pmic_suspend, sprd_pmic_resume);
+
 static const struct of_device_id sprd_pmic_match[] = {
        { .compatible = "sprd,sc2731", .data = &sc2731_data },
        {},
@@ -234,6 +259,7 @@ static struct spi_driver sprd_pmic_driver = {
                .name = "sc27xx-pmic",
                .bus = &spi_bus_type,
                .of_match_table = sprd_pmic_match,
+               .pm = &sprd_pmic_pm_ops,
        },
        .probe = sprd_pmic_probe,
 };