From patchwork Mon Oct 15 13:07:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 148840 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3778585lji; Mon, 15 Oct 2018 06:10:45 -0700 (PDT) X-Google-Smtp-Source: ACcGV61zkUTplkw4Uakq6ds+5EybMV3BIpe9/5UOVZtShz51vTQWPva98HoArSVyZukH1I8X64vg X-Received: by 2002:a62:241a:: with SMTP id r26-v6mr13085211pfj.74.1539609045212; Mon, 15 Oct 2018 06:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539609045; cv=none; d=google.com; s=arc-20160816; b=ZZzQvxwODMeATSYTNshod/jH+0DjzcnAJ4+h8I26ZPQl/p/TyHeXWR6Eld423Cj3E3 8o2AjWpMKyYk/NUrKgkR5ciz4fBpygocc0RGifuHoxVHIHuCnv+2BSYKpYUID0KfYHtc CCcSMzfFxwY68W4wSuWV/4dKfp3HZjeNI9oCzg8DZ55hxtTWQ8r/d/UM4G1/JWZNZdrL uaKBtW865HXUWNq7TmafuHs5Cx5QTH3F6/upKKTqI0PSQlLvjrcTSjVs+Rv9iqIsG2Wo XvNjczNbmMuyaA7sbmp72O2prMWwxofWQHXdX+y7HzzzUR1LdgvE8EXY7AMNrbMjKTqd a05w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=aJ3V4yGfoHPLSrtuLLso+8cw5slXP0Cp3diRxt7pW8k=; b=O3W/ZY4MwZqvq+at97p9puavsCIo/ngzbvQO8iEbWG+J2Bh3MpyIb9nsOwcig/Evyg ut03qm67/2OmO/sHQvmE0fdQsJdRMe+r7J9yvAGQ3WaKEGgdtbtwDyjQo1/XH8uzLNBj inwFcxNe3STvk5GpUBtAqLPSP7Pn3oooV309T8RTm3uFRHwH0fgbnwXpkJRCnwSl/wD6 KMouz6jo/VnGw8YAJkOmUlqA2dbtsmq0f4qyWO7639xoOYZOrfUAgSuo7lh/IbQhX6dd wQGBwGtoJAuDD3/wTcuhC9XJeo6Vdaem6vwale1hunbXGqF8dMuPW4CctVAQmamCroMu ctKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=TB3nbuBG; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3-v6si8169164plb.197.2018.10.15.06.10.44; Mon, 15 Oct 2018 06:10:45 -0700 (PDT) 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=@ti.com header.s=ti-com-17Q1 header.b=TB3nbuBG; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726978AbeJOUyi (ORCPT + 32 others); Mon, 15 Oct 2018 16:54:38 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:38874 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726659AbeJOUyh (ORCPT ); Mon, 15 Oct 2018 16:54:37 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id w9FD8eiA119981; Mon, 15 Oct 2018 08:08:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1539608920; bh=aJ3V4yGfoHPLSrtuLLso+8cw5slXP0Cp3diRxt7pW8k=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=TB3nbuBGTHpvcwvgAHkDX3b7IIeARz189/XVfR7gMPOIY5k71zUi9nonJ7trmj091 pFqUN7YZOXbqHNmo0XFKLwtB1Fq286W3anysDcEy3EAatwkTLVKU7Kzxok9wpZgf/0 9rD/0yutQrTcb55gGIThJKxc2XlJzFvbAxlHf/fw= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w9FD8e0R000775; Mon, 15 Oct 2018 08:08:40 -0500 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Mon, 15 Oct 2018 08:08:40 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Mon, 15 Oct 2018 08:08:40 -0500 Received: from a0393678ub.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w9FD7tLF009433; Mon, 15 Oct 2018 08:08:37 -0500 From: Kishon Vijay Abraham I To: Bjorn Helgaas , Lorenzo Pieralisi , Murali Karicheri , Jingoo Han , Gustavo Pimentel CC: Rob Herring , , , , , Kishon Vijay Abraham I Subject: [PATCH 12/19] PCI: keystone: Invoke pm_runtime APIs to enable clock Date: Mon, 15 Oct 2018 18:37:14 +0530 Message-ID: <20181015130721.5535-13-kishon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181015130721.5535-1-kishon@ti.com> References: <20181015130721.5535-1-kishon@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Invoke pm_runtime APIs to enable clocks and remove explicit clock enabling using clk_prepare_enable(). Signed-off-by: Kishon Vijay Abraham I --- drivers/pci/controller/dwc/pci-keystone.c | 28 ++++++++++------------- 1 file changed, 12 insertions(+), 16 deletions(-) -- 2.17.1 diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index bf37609ad75b..891bdfc5921c 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; @@ -993,26 +992,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: @@ -1027,10 +1022,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]);