From patchwork Tue Jul 21 07:44:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 11675129 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7256113A4 for ; Tue, 21 Jul 2020 07:49:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4BFAA208E4 for ; Tue, 21 Jul 2020 07:49:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Tn3nX2ua" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BFAA208E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4LJuworycMPo2F2phZbI8Kfnjcs008SmUf0IpT6QnTw=; b=Tn3nX2uaul6XvGjVQh8kSFs+m+ caQ2ivfs6LLwsz0tNOLp4pQKEsFwuqvr30tqaZ+oqTdzMC7LSe0hVX5RURAudTBykeLNzRLdoGpPM LK59FnwQ1gBJHeGNconpIUN76OXHw+ShqvSTEQCRw7JEkf5c5r0SdMusXS0vFFb2mzFbAlcMleOCS ZtufeN6axnB+/ZRRiR0OTuQsianmIor5m1QHOXg63RDfXqR9vQNqCFFIPsGFNUS6YwohPrB67xFKp CWze7O7JYHW0QdLl++25L4I7+FEoQMVSG2rvhyWDbrecrZU6692JvHndD3Wj9FOfbae1xxzDIRGoq AHOmLacw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxn0r-0002jP-TI; Tue, 21 Jul 2020 07:48:33 +0000 Received: from inva021.nxp.com ([92.121.34.21]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxn0j-0002fd-JY for linux-arm-kernel@lists.infradead.org; Tue, 21 Jul 2020 07:48:26 +0000 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 7784320154A; Tue, 21 Jul 2020 09:48:24 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 33B892003FA; Tue, 21 Jul 2020 09:48:20 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id C720040305; Tue, 21 Jul 2020 15:29:38 +0800 (SGT) From: Richard Zhu To: l.stach@pengutronix.de, bhelgaas@google.com, shawnguo@kernel.org, festevam@gmail.com Subject: [PATCH 2/2] PCI: imx: add another regulator for imx pcie Date: Tue, 21 Jul 2020 15:44:30 +0800 Message-Id: <1595317470-9394-2-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595317470-9394-1-git-send-email-hongxing.zhu@nxp.com> References: <1595317470-9394-1-git-send-email-hongxing.zhu@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200721_034825_757895_0884F6C8 X-CRM114-Status: GOOD ( 11.52 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [92.121.34.21 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Zhu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org One more regulator is required to turn on the external oscillator populated on the iMX6QP SABRESD board. Add another regulator to enable PCIe on iMX6QP SABRESD board. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 8f08ae53f53e..9e1563601835 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -81,6 +81,7 @@ struct imx6_pcie { u32 tx_swing_low; int link_gen; struct regulator *vpcie; + struct regulator *vepdev; void __iomem *phy_base; /* power domain for pcie */ @@ -507,6 +508,14 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) return; } } + if (imx6_pcie->vepdev && !regulator_is_enabled(imx6_pcie->vepdev)) { + ret = regulator_enable(imx6_pcie->vepdev); + if (ret) { + dev_err(dev, "failed to enable vepdev regulator: %d\n", + ret); + goto err_pcie_vepdev; + } + } ret = clk_prepare_enable(imx6_pcie->pcie_phy); if (ret) { @@ -595,6 +604,13 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) err_pcie_bus: clk_disable_unprepare(imx6_pcie->pcie_phy); err_pcie_phy: + if (imx6_pcie->vepdev && regulator_is_enabled(imx6_pcie->vepdev) > 0) { + ret = regulator_disable(imx6_pcie->vepdev); + if (ret) + dev_err(dev, "failed to disable vepdev regulator: %d\n", + ret); + } +err_pcie_vepdev: if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) { ret = regulator_disable(imx6_pcie->vpcie); if (ret) @@ -1178,6 +1194,12 @@ static int imx6_pcie_probe(struct platform_device *pdev) return PTR_ERR(imx6_pcie->vpcie); imx6_pcie->vpcie = NULL; } + imx6_pcie->vepdev = devm_regulator_get_optional(&pdev->dev, "vepdev"); + if (IS_ERR(imx6_pcie->vepdev)) { + if (PTR_ERR(imx6_pcie->vepdev) != -ENODEV) + return PTR_ERR(imx6_pcie->vepdev); + imx6_pcie->vepdev = NULL; + } platform_set_drvdata(pdev, imx6_pcie);