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 v4 12/17] PCI: imx6: Allow probe deferral by reset GPIO
Date: Wed, 16 Jan 2019 18:16:55 -0800	[thread overview]
Message-ID: <20190117021700.4443-13-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190117021700.4443-1-andrew.smirnov@gmail.com>

Port of a Linux commit bde4a5a00e761f55be92f62378cf5024ced79ee3

  Some designs implement reset GPIO via a GPIO expander connected to a
  peripheral bus.  One such example would be i.MX7 Sabre board where said
  GPIO is provided by SPI shift register connected to a bitbanged SPI bus.
  To support such designs, allow reset GPIO request to defer probing of the
  driver.

  Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
  Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
  Cc: yurovsky@gmail.com
  Cc: Fabio Estevam <fabio.estevam@nxp.com>
  Cc: Dong Aisheng <dongas86@gmail.com>
  Cc: linux-arm-kernel@lists.infradead.org

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

diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c
index 6471f95b62..ce68b007ab 100644
--- a/drivers/pci/pci-imx6.c
+++ b/drivers/pci/pci-imx6.c
@@ -562,8 +562,8 @@ static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
 	.host_init = imx6_pcie_host_init,
 };
 
-static int __init imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
-				     struct device_d *dev)
+static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
+			      struct device_d *dev)
 {
 	struct dw_pcie *pci = imx6_pcie->pci;
 	struct pcie_port *pp = &pci->pp;
@@ -581,7 +581,7 @@ static int __init imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
 	return 0;
 }
 
-static int __init imx6_pcie_probe(struct device_d *dev)
+static int imx6_pcie_probe(struct device_d *dev)
 {
 	struct resource *iores;
 	struct dw_pcie *pci;
@@ -599,13 +599,11 @@ static int __init imx6_pcie_probe(struct device_d *dev)
 	imx6_pcie->variant =
 		(enum imx6_pcie_variants)of_device_get_match_data(dev);
 
-	iores = dev_request_mem_resource(dev, 0);
-	if (IS_ERR(iores))
-		return PTR_ERR(iores);
-	pci->dbi_base = IOMEM(iores->start);
-
 	/* Fetch GPIOs */
 	imx6_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
+	if (imx6_pcie->reset_gpio == -EPROBE_DEFER)
+		return imx6_pcie->reset_gpio;
+
 	if (gpio_is_valid(imx6_pcie->reset_gpio)) {
 		ret = gpio_request_one(imx6_pcie->reset_gpio,
 					    GPIOF_OUT_INIT_LOW, "PCIe reset");
@@ -615,6 +613,11 @@ static int __init imx6_pcie_probe(struct device_d *dev)
 		}
 	}
 
+	iores = dev_request_mem_resource(dev, 0);
+	if (IS_ERR(iores))
+		return PTR_ERR(iores);
+	pci->dbi_base = IOMEM(iores->start);
+
 	/* Fetch clocks */
 	imx6_pcie->pcie_phy = clk_get(dev, "pcie_phy");
 	if (IS_ERR(imx6_pcie->pcie_phy)) {
-- 
2.20.1


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

  parent reply	other threads:[~2019-01-17  2:17 UTC|newest]

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

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=20190117021700.4443-13-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