From: Kishon Vijay Abraham I <kishon@ti.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Murali Karicheri <m-karicheri2@ti.com>,
Jingoo Han <jingoohan1@gmail.com>,
Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Rob Herring <robh+dt@kernel.org>, <linux-pci@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: [PATCH v2 12/21] PCI: keystone: Invoke pm_runtime APIs to enable clock
Date: Wed, 17 Oct 2018 13:11:05 +0530 [thread overview]
Message-ID: <20181017074114.28239-13-kishon@ti.com> (raw)
In-Reply-To: <20181017074114.28239-1-kishon@ti.com>
Invoke pm_runtime APIs to enable clocks and remove explicit
clock enabling using clk_prepare_enable().
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/pci/controller/dwc/pci-keystone.c | 28 ++++++++++-------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 5ae73c185c99..4f764ec49a4c 100644
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -96,7 +96,6 @@
struct keystone_pcie {
struct dw_pcie *pci;
- struct clk *clk;
/* PCI Device ID */
u32 device_id;
int num_legacy_host_irqs;
@@ -989,26 +988,22 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, ks_pcie);
- ks_pcie->clk = devm_clk_get(dev, "pcie");
- if (IS_ERR(ks_pcie->clk)) {
- dev_err(dev, "Failed to get pcie rc clock\n");
- ret = PTR_ERR(ks_pcie->clk);
- goto err_phy;
+ pm_runtime_enable(dev);
+ ret = pm_runtime_get_sync(dev);
+ if (ret < 0) {
+ dev_err(dev, "pm_runtime_get_sync failed\n");
+ goto err_get_sync;
}
- ret = clk_prepare_enable(ks_pcie->clk);
- if (ret)
- goto err_phy;
-
ret = ks_pcie_add_pcie_port(ks_pcie, pdev);
if (ret < 0)
- goto fail_clk;
+ goto err_get_sync;
return 0;
-fail_clk:
- clk_disable_unprepare(ks_pcie->clk);
-err_phy:
+err_get_sync:
+ pm_runtime_put(dev);
+ pm_runtime_disable(dev);
ks_pcie_disable_phy(ks_pcie);
err_link:
@@ -1023,10 +1018,11 @@ static int __exit ks_pcie_remove(struct platform_device *pdev)
struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev);
struct device_link **link = ks_pcie->link;
int num_lanes = ks_pcie->num_lanes;
+ struct device *dev = &pdev->dev;
- clk_disable_unprepare(ks_pcie->clk);
+ pm_runtime_put(dev);
+ pm_runtime_disable(dev);
ks_pcie_disable_phy(ks_pcie);
-
while (num_lanes--)
device_link_del(link[num_lanes]);
--
2.17.1
next prev parent reply other threads:[~2018-10-17 7:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 7:40 [PATCH v2 00/21] PCI: Cleanup pci-keystone driver Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 01/21] PCI: keystone: Use quirk to limit MRRS for K2G Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 02/21] PCI: keystone: Use quirk to set MRRS for PCI host bridge Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 03/21] PCI: keystone: Move dw_pcie_setup_rc out of ks_pcie_establish_link() Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 04/21] PCI: keystone: Do not initiate link training multiple times Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 05/21] PCI: keystone: Remove unused argument from ks_dw_pcie_host_init() Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 06/21] PCI: keystone: Merge pci-keystone-dw.c and pci-keystone.c Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 07/21] PCI: keystone: Remove redundant platform_set_drvdata Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 08/21] PCI: keystone: Use uniform function naming convention Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 09/21] dt-bindings: PCI: keystone: Add bindings to get device control module Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 10/21] PCI: keystone: Use SYSCON APIs to get device ID from " Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 11/21] PCI: keystone: Cleanup PHY handling Kishon Vijay Abraham I
2018-10-17 7:41 ` Kishon Vijay Abraham I [this message]
2018-10-17 7:41 ` [PATCH v2 13/21] PCI: keystone: Cleanup configuration space access Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 14/21] PCI: keystone: Get number of outbound windows from DT Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 15/21] PCI: keystone: Cleanup outbound window configuration Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 16/21] PCI: keystone: Cleanup set_dbi_mode and get_dbi_mode Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 17/21] PCI: keystone: Cleanup ks_pcie_link_up() Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 18/21] PCI: keystone: Use ERR_IRQ_STATUS instead of ERR_IRQ_STATUS_RAW to get interrupt status Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 19/21] PCI: keystone: Add debug error message for all errors Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 20/21] PCI: keystone: Reorder header file in alphabetical order Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 21/21] PCI: keystone: Cleanup macros defined in pci-keystone.c Kishon Vijay Abraham I
2018-10-17 11:12 ` [PATCH v2 00/21] PCI: Cleanup pci-keystone driver Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181017074114.28239-13-kishon@ti.com \
--to=kishon@ti.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=gustavo.pimentel@synopsys.com \
--cc=jingoohan1@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=m-karicheri2@ti.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).