mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 18/18] PCI: imx6: Port imx6_pcie_ltssm_enable()
Date: Fri, 11 Jan 2019 21:55:24 -0800	[thread overview]
Message-ID: <20190112055524.7733-19-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190112055524.7733-1-andrew.smirnov@gmail.com>

Port imx6_pcie_ltssm_enable() from Linux kernel driver.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/pci/pci-imx6.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c
index 9aa307aabf..c1719093be 100644
--- a/drivers/pci/pci-imx6.c
+++ b/drivers/pci/pci-imx6.c
@@ -457,6 +457,23 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie)
 	return -EINVAL;
 }
 
+static void imx6_pcie_ltssm_enable(struct device_d *dev)
+{
+	struct imx6_pcie *imx6_pcie = dev->priv;
+	u32 gpr12;
+
+	switch (imx6_pcie->variant) {
+	case IMX6Q:
+	case IMX6QP:
+		gpr12 = readl(imx6_pcie->iomuxc_gpr + IOMUXC_GPR12);
+		gpr12 |= IMX6Q_GPR12_PCIE_CTL_2;
+		writel(gpr12, imx6_pcie->iomuxc_gpr + IOMUXC_GPR12);
+		break;
+	case IMX7D:
+		reset_control_deassert(imx6_pcie->apps_reset);
+		break;
+	}
+}
 
 static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
 {
@@ -464,7 +481,6 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
 	struct device_d *dev = pci->dev;
 	uint32_t tmp;
 	int ret;
-	u32 gpr12;
 
 	/*
 	 * Force Gen1 operation when starting the link.  In case the link is
@@ -476,14 +492,7 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
 	tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN1;
 	dw_pcie_writel_dbi(pci, PCIE_RC_LCR, tmp);
 
-	/* Start LTSSM. */
-	if (imx6_pcie->variant == IMX7D) {
-		reset_control_deassert(imx6_pcie->apps_reset);
-	} else {
-		gpr12 = readl(imx6_pcie->iomuxc_gpr + IOMUXC_GPR12);
-		gpr12 |= IMX6Q_GPR12_PCIE_CTL_2;
-		writel(gpr12, imx6_pcie->iomuxc_gpr + IOMUXC_GPR12);
-	}
+	imx6_pcie_ltssm_enable(dev);
 
 	ret = imx6_pcie_wait_for_link(imx6_pcie);
 	if (ret)
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2019-01-12  5:56 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-12  5:55 [PATCH v2 00/18] PCIe support for i.MX7 Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 01/18] regulator: Convert drivers to use struct regulator_desc Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 02/18] regulator: Port basic regmap regulator functions Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 03/18] regulator: Add support for setting regulator's voltage Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 04/18] base: driver: Drop redundant list_empty() check Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 05/18] base: Port driver_deferred_probe_check_state() from Linux Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 06/18] regulator: Add primitive support for deferred probe Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 07/18] regulator: Port ANATOP driver from Linux Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 08/18] drivers: base: Port power management code " Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 09/18] soc: imx: Add GPCv2 power gating driver Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 10/18] reset: Add i.MX7 SRC reset driver Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 11/18] reset: Mark local functions as static Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 12/18] PCI: imx6: Add code to support i.MX7D Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 13/18] PCI: imx6: Allow probe deferral by reset GPIO Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 14/18] PCI: imx6: Do not wait for speed change on i.MX7 Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 15/18] PCI: imx6: Do not switch speed if Gen2 is disabled Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 16/18] PCI: imx6: Fix spelling mistake: "contol" -> "control" Andrey Smirnov
2019-01-12  5:55 ` [PATCH v2 17/18] PCI: imx6: Drop unnecessary root_bus_nr setting Andrey Smirnov
2019-01-12  5:55 ` Andrey Smirnov [this message]
2019-01-12 10:48 ` [PATCH v2 00/18] PCIe support for i.MX7 Sam Ravnborg
2019-01-12 19:49   ` Andrey Smirnov
2019-01-12 20:10     ` Sam Ravnborg
2019-01-15  7:22     ` Sascha Hauer
2019-01-15 20:16       ` Andrey Smirnov

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=20190112055524.7733-19-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.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