From patchwork Fri Nov 18 12:01:42 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: 82867 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp34413qge; Fri, 18 Nov 2016 04:02:11 -0800 (PST) X-Received: by 10.13.197.68 with SMTP id h65mr7003506ywd.84.1479470531207; Fri, 18 Nov 2016 04:02:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m13si1610626ybm.11.2016.11.18.04.02.11; Fri, 18 Nov 2016 04:02:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753589AbcKRMCH (ORCPT + 4 others); Fri, 18 Nov 2016 07:02:07 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:36026 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753580AbcKRMCF (ORCPT ); Fri, 18 Nov 2016 07:02:05 -0500 Received: by mail-pf0-f174.google.com with SMTP id 189so54841171pfz.3 for ; Fri, 18 Nov 2016 04:02:05 -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=+4FFV+DRaHoBMF6myDiAjEWi6O6iP5/mLyh2/05qcsE=; b=CRfy18249MjDOPZp9ya0/26PH4cndVA/zgFySF0GxeL+XI90H9mADKeW1SaTCT177d J95eMpryo0lNE/r6QToCXiffur9343Ooef40NwizG5bhV43A7vtal3yGhab1USTkeI9u IF2JV0QqbPS0VOEuGeVrFxrv2wYZ/InEVjdcI= 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=+4FFV+DRaHoBMF6myDiAjEWi6O6iP5/mLyh2/05qcsE=; b=l2EhKL6N8qBTKBw7CY4RFrDlXXLvBb1EAC5s/a86yatIRbEvMBq6DOPgHNrezpUX3O dTJZOUYd0IGeFiwuutkiuoSFRE5HL/Pkfbj1dwDVmtTfOlrO8AM11GpcuaNmePkHmeeP D8bGdqkBDEbinJquL/A1mdQha7+9qmyo65HpAOrLZefu923uD6+0Inlg1k5+21fZghfN YNpyFFEHUdecQDrIzaJDwEXjmx0UygKmnm2z5OeYGEckWPN8t+q8evRWGMnIJCVCd1kx 0HrTwTiMUzsyy4ionGeHNsXxGoAAFt5K151LSramT9fb4ZE2sNAJJlaZJB+4MgAMd70k 7tng== X-Gm-Message-State: ABUngvfkcu3pVyCFGQL0HThD3MVBZFBfHmXXDWYk1A4pmRqyued9FbCFm4u96uUpitOL/gLx X-Received: by 10.99.142.201 with SMTP id k192mr18010118pge.174.1479470524761; Fri, 18 Nov 2016 04:02:04 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id 131sm17440836pfx.92.2016.11.18.04.02.01 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Nov 2016 04:02:04 -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 1/2] usb: host: plat: Enable xhci plat runtime PM Date: Fri, 18 Nov 2016 20:01:42 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Enable the xhci plat runtime PM for parent device to suspend/resume xhci. Signed-off-by: Baolin Wang --- drivers/usb/host/xhci-plat.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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), },