From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 13/18] PCI: imx6: Allow probe deferral by reset GPIO
Date: Fri, 11 Jan 2019 21:55:19 -0800 [thread overview]
Message-ID: <20190112055524.7733-14-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190112055524.7733-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
next prev 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 ` Andrey Smirnov [this message]
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 ` [PATCH v2 18/18] PCI: imx6: Port imx6_pcie_ltssm_enable() Andrey Smirnov
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-14-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