Hi Jeffy

On 2017/8/17 20:04, Jeffy Chen wrote:
Add support for PCIE_WAKE pin in rockchip pcie driver.

Signed-off-by: Jeffy Chen <jeffy.c...@rock-chips.com>
---

Changes in v2:
Use dev_pm_set_dedicated_wake_irq
         -- Suggested by Brian Norris <briannor...@chromium.com>

  drivers/pci/host/pcie-rockchip.c | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c
index 7bb9870f6d8c..c2b973c738fe 100644
--- a/drivers/pci/host/pcie-rockchip.c
+++ b/drivers/pci/host/pcie-rockchip.c
@@ -36,6 +36,7 @@
  #include <linux/pci_ids.h>
  #include <linux/phy/phy.h>
  #include <linux/platform_device.h>
+#include <linux/pm_wakeirq.h>
  #include <linux/reset.h>
  #include <linux/regmap.h>
@@ -853,7 +854,6 @@ static void rockchip_pcie_legacy_int_handler(struct irq_desc *desc)
        chained_irq_exit(chip, desc);
  }
-
  /**
   * rockchip_pcie_parse_dt - Parse Device Tree
   * @rockchip: PCIe port information
@@ -1018,6 +1018,14 @@ static int rockchip_pcie_parse_dt(struct rockchip_pcie 
*rockchip)
                return err;
        }
+ device_init_wakeup(dev, true);
+       irq = platform_get_irq_byname(pdev, "wake");
+       if (irq >= 0) {
+               err = dev_pm_set_dedicated_wake_irq(dev, irq);
+               if (err)
+                       dev_err(dev, "failed to setup PCIe wake IRQ\n");
+       }
+
        rockchip->vpcie3v3 = devm_regulator_get_optional(dev, "vpcie3v3");
        if (IS_ERR(rockchip->vpcie3v3)) {
                if (PTR_ERR(rockchip->vpcie3v3) == -EPROBE_DEFER)
@@ -1524,6 +1532,9 @@ static int rockchip_pcie_remove(struct platform_device 
*pdev)
        struct device *dev = &pdev->dev;
        struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
+ dev_pm_clear_wake_irq(dev);
+       device_init_wakeup(dev, false);
+

Looks good overall but I think we need this on the
error handling path of rockchip_pcie_probe as well?

        pci_stop_root_bus(rockchip->root_bus);
        pci_remove_root_bus(rockchip->root_bus);
        pci_unmap_iospace(rockchip->io);


Reply via email to