From patchwork Mon Nov 21 06:28:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 83185 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1332056qge; Sun, 20 Nov 2016 22:28:52 -0800 (PST) X-Received: by 10.13.214.210 with SMTP id y201mr13125002ywd.254.1479709732305; Sun, 20 Nov 2016 22:28:52 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q66si3053224ywh.21.2016.11.20.22.28.52; Sun, 20 Nov 2016 22:28:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753517AbcKUG2d (ORCPT + 26 others); Mon, 21 Nov 2016 01:28:33 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:35144 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751324AbcKUG2b (ORCPT ); Mon, 21 Nov 2016 01:28:31 -0500 Received: by mail-pg0-f46.google.com with SMTP id p66so127137811pga.2 for ; Sun, 20 Nov 2016 22:28:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=T0gu/IENbohEopJfvOdZUuYxrj+Vj6Bpcgz+ZHJ08bk=; b=XlkXkvIglSY5zhs8N1Sp0xi49DEMn73vxrf1TFEzDjaCy7uwHi++hscmH/4YEY5jAi nXt6LhjG3mDyDUQID0GitmImhNQZtGpbsJg9PQS5ICF/I8w4DPP7lBJLrnlBlV65mKE0 RdztXnmxCeXAQPp97jxvPnTvlf/Y10SIaxs8o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=T0gu/IENbohEopJfvOdZUuYxrj+Vj6Bpcgz+ZHJ08bk=; b=XhsR7ztNdWDDCEQYx3jtZ/Dnyvg4+KuM2Xai4JIlVEtYSeFV6cKsvpXEtvCX/yhiBU 5gmkSTB2GrMQuVau6ax/8QV2zpAdVkfiDyF1AlwUOFMDaeGVwwSBrBeid74GOokmaTNE x02pVYiOUwPYLL+PezY9QWRf3/lgGkbpRQ3/tgSZwahAUaHRfkhOzLwCjMtogq33JYX1 KH1o9KGJePwoC50atPgUNoGVhpzvjhZRYfpju+Z6O5lCxrJR3DZKi70HMN+tlB2f7yZr QOrptM5RvTOGugnMsC02kz8/187OIB6vjSEvDAxzxpSxjTV7fGTBPZy4io3m/8e4+RzW +drA== X-Gm-Message-State: AKaTC00Iggixx1qKOX+/ypQ1N/BYBMggHRJAqwQA3x6V0SUjZ3y613YfA51wiob1UbRiD6qn X-Received: by 10.99.42.80 with SMTP id q77mr28821911pgq.170.1479709711129; Sun, 20 Nov 2016 22:28:31 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id m5sm16233264pgn.42.2016.11.20.22.28.28 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Nov 2016 22:28:30 -0800 (PST) From: Baolin Wang To: mathias.nyman@intel.com, balbi@kernel.org Cc: gregkh@linuxfoundation.org, broonie@kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, baolin.wang@linaro.org Subject: [PATCH v2 1/2] usb: host: plat: Enable xhci plat runtime PM Date: Mon, 21 Nov 2016 14:28:02 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Enable the xhci plat runtime PM for parent device to suspend/resume xhci. Signed-off-by: Baolin Wang --- Changes since v1: - No updates. --- drivers/usb/host/xhci-plat.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) -- 1.7.9.5 diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index ed56bf9..13f86ad 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -246,6 +246,9 @@ static int xhci_plat_probe(struct platform_device *pdev) if (ret) goto dealloc_usb2_hcd; + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + return 0; @@ -274,6 +277,7 @@ static int xhci_plat_remove(struct platform_device *dev) struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct clk *clk = xhci->clk; + pm_runtime_disable(&dev->dev); usb_remove_hcd(xhci->shared_hcd); usb_phy_shutdown(hcd->usb_phy); @@ -311,14 +315,37 @@ static int xhci_plat_resume(struct device *dev) return xhci_resume(xhci, 0); } +#endif /* CONFIG_PM_SLEEP */ + +#ifdef CONFIG_PM +static int xhci_plat_runtime_suspend(struct device *dev) +{ + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct xhci_hcd *xhci = hcd_to_xhci(hcd); + + return xhci_suspend(xhci, device_may_wakeup(dev)); +} + +static int xhci_plat_runtime_resume(struct device *dev) +{ + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct xhci_hcd *xhci = hcd_to_xhci(hcd); + + return xhci_resume(xhci, 0); +} + +static int xhci_plat_runtime_idle(struct device *dev) +{ + return 0; +} +#endif /* CONFIG_PM */ static const struct dev_pm_ops xhci_plat_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) + + SET_RUNTIME_PM_OPS(xhci_plat_runtime_suspend, xhci_plat_runtime_resume, + xhci_plat_runtime_idle) }; -#define DEV_PM_OPS (&xhci_plat_pm_ops) -#else -#define DEV_PM_OPS NULL -#endif /* CONFIG_PM */ static const struct acpi_device_id usb_xhci_acpi_match[] = { /* XHCI-compliant USB Controller */ @@ -332,7 +359,7 @@ static int xhci_plat_resume(struct device *dev) .remove = xhci_plat_remove, .driver = { .name = "xhci-hcd", - .pm = DEV_PM_OPS, + .pm = &xhci_plat_pm_ops, .of_match_table = of_match_ptr(usb_xhci_of_match), .acpi_match_table = ACPI_PTR(usb_xhci_acpi_match), },