Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp204274pxf; Thu, 25 Mar 2021 02:00:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMWPrz/G9jBQdhJsgvGhHbydOfP9msYxBC5Ahxagjz1aIAgwhNVU5dldHNFOVcGzZ884v6 X-Received: by 2002:aa7:cf16:: with SMTP id a22mr7673942edy.288.1616662819396; Thu, 25 Mar 2021 02:00:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616662819; cv=none; d=google.com; s=arc-20160816; b=BWWpwdFNRvL6+K/EatdrDj79Eu4r+/OYFcqAHbj1QE+v5WIOxxiEWC7rAQp2VN6v1r hkoXmD9dTYjqkB8Luo/9ykf64v1ToqYhRPKho5VaAPQnB+jDic/1sOb0JNNOLWCWPgF6 2vK6afBkKYa5fs06vWb4foMxvoExXLvdPGEt+7hOGr6Ls87V7MH7PIqctWT6cq37vRka thTS4RLyCYnYOWnjZD8alIx0Pg1U846XUqNIL7Qk4Q9BbphAuaX8dEcXSh61eNplhVRT qLhPrRbJYb7fYRxO1EK53pjMyuGy8mVE+tO5B4spNbYDfp9nRm/YDOcjDACZLtLNiFOI 1O9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=ZHkIEsj7uZofhwcPb64wK3RoFmB4Cp794Lc53dHd6cU=; b=0+z7qfXyhz3IqFlU5TNTl1facLNTlWWI8/7x0Bzvhx44Nlaxogrd+2ignvCJNpXWOX yzPRXnDfdRFzdvoprtYzWZ2Ub25m/zjg/Ydbk3RaaIsLdwhnwNdyoU2oP+1LampQjNvw M2SOuq9MTQCvawCy2K0ygZsgvh2NiBmIySzLg45e3Va52fes4+RLkmX8aqk+x2/evejK qrhI8WO4Xa8GfRfRpqH/uyK4XHtrfFml+Ks6M+IkB3Tp7FFbpBB4P7VgqgOdD839rf5B AHzXeBlkzGDZjJ4tDgZO1tygrMl/T+k3b7ZJgzxc0hs2iaNy+9Twbq8wDa8BkX7K9MeJ AsDA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e7si3686917edn.416.2021.03.25.01.59.55; Thu, 25 Mar 2021 02:00:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229764AbhCYI7C (ORCPT + 99 others); Thu, 25 Mar 2021 04:59:02 -0400 Received: from inva020.nxp.com ([92.121.34.13]:57014 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbhCYI6f (ORCPT ); Thu, 25 Mar 2021 04:58:35 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 6CDA91A133E; Thu, 25 Mar 2021 09:58:34 +0100 (CET) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 59C8C1A313B; Thu, 25 Mar 2021 09:58:29 +0100 (CET) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 72B2A40307; Thu, 25 Mar 2021 09:58:22 +0100 (CET) From: Richard Zhu To: l.stach@pengutronix.de, andrew.smirnov@gmail.com, shawnguo@kernel.org, kw@linux.com, bhelgaas@google.com, stefan@agner.ch, lorenzo.pieralisi@arm.com Cc: linux-pci@vger.kernel.org, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Richard Zhu Subject: [PATCH v3 3/3] PCI: imx: clear vreg bypass when pcie vph voltage is 3v3 Date: Thu, 25 Mar 2021 16:44:42 +0800 Message-Id: <1616661882-26487-4-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1616661882-26487-1-git-send-email-hongxing.zhu@nxp.com> References: <1616661882-26487-1-git-send-email-hongxing.zhu@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Both 1.8v and 3.3v power supplies can be used by i.MX8MQ PCIe PHY. In default, the PCIE_VPH voltage is suggested to be 1.8v refer to data sheet. When PCIE_VPH is supplied by 3.3v in the HW schematic design, the VREG_BYPASS bits of GPR registers should be cleared from default value 1b'1 to 1b'0. Thus, the internal 3v3 to 1v8 translator would be turned on. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 853ea8e82952..d9d534f0840f 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -37,6 +37,7 @@ #define IMX8MQ_GPR_PCIE_REF_USE_PAD BIT(9) #define IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE_EN BIT(10) #define IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE BIT(11) +#define IMX8MQ_GPR_PCIE_VREG_BYPASS BIT(12) #define IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE GENMASK(11, 8) #define IMX8MQ_PCIE2_BASE_ADDR 0x33c00000 @@ -80,6 +81,7 @@ struct imx6_pcie { u32 tx_swing_full; u32 tx_swing_low; struct regulator *vpcie; + struct regulator *vph; void __iomem *phy_base; /* power domain for pcie */ @@ -621,6 +623,17 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) imx6_pcie_grp_offset(imx6_pcie), IMX8MQ_GPR_PCIE_REF_USE_PAD, IMX8MQ_GPR_PCIE_REF_USE_PAD); + /* + * Regarding to the datasheet, the PCIE_VPH is suggested + * to be 1.8V. If the PCIE_VPH is supplied by 3.3V, the + * VREG_BYPASS should be cleared to zero. + */ + if (imx6_pcie->vph && + regulator_get_voltage(imx6_pcie->vph) > 3000000) + regmap_update_bits(imx6_pcie->iomuxc_gpr, + imx6_pcie_grp_offset(imx6_pcie), + IMX8MQ_GPR_PCIE_VREG_BYPASS, + 0); break; case IMX7D: regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, @@ -1130,6 +1143,13 @@ static int imx6_pcie_probe(struct platform_device *pdev) imx6_pcie->vpcie = NULL; } + imx6_pcie->vph = devm_regulator_get_optional(&pdev->dev, "vph"); + if (IS_ERR(imx6_pcie->vph)) { + if (PTR_ERR(imx6_pcie->vph) != -ENODEV) + return PTR_ERR(imx6_pcie->vph); + imx6_pcie->vph = NULL; + } + platform_set_drvdata(pdev, imx6_pcie); ret = imx6_pcie_attach_pd(dev); -- 2.17.1