From: "Petr Štetiar" <ynezz@true.cz>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-pci@vger.kernel.org, "Bjorn Helgaas" <bhelgaas@google.com>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Richard Zhu" <Richard.Zhu@freescale.com>,
"Petr Štetiar" <ynezz@true.cz>
Subject: [PATCH] PCI: imx6: Fix reset-gpio to work with active low GPIO
Date: Mon, 16 Nov 2015 16:19:07 +0100 [thread overview]
Message-ID: <1447687147-19436-1-git-send-email-ynezz@true.cz> (raw)
It's currently not possible to use reset-gpio on board where the GPIO is
active low as the code incorrectly assumes, that reset-gpio will be
always active high.
In my case the broken behavior was observed on Toradex Apalis SoM with
Ixora base board.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
drivers/pci/host/pci-imx6.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index fdb9536..cd7ed71 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -293,9 +293,11 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
/* Some boards don't have PCIe reset GPIO. */
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
- gpio_set_value(imx6_pcie->reset_gpio, 0);
+ struct gpio_desc *gd = gpio_to_desc(imx6_pcie->reset_gpio);
+
+ gpiod_set_value(gd, 0);
msleep(100);
- gpio_set_value(imx6_pcie->reset_gpio, 1);
+ gpiod_set_value(gd, 1);
}
return 0;
@@ -559,6 +561,8 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
struct pcie_port *pp;
struct device_node *np = pdev->dev.of_node;
struct resource *dbi_base;
+ enum of_gpio_flags of_flags;
+ int flags = GPIOF_OUT_INIT_LOW;
int ret;
imx6_pcie = devm_kzalloc(&pdev->dev, sizeof(*imx6_pcie), GFP_KERNEL);
@@ -578,10 +582,13 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
return PTR_ERR(pp->dbi_base);
/* Fetch GPIOs */
- imx6_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
+ imx6_pcie->reset_gpio = of_get_named_gpio_flags(np, "reset-gpio", 0,
+ &of_flags);
if (gpio_is_valid(imx6_pcie->reset_gpio)) {
+ if (of_flags & OF_GPIO_ACTIVE_LOW)
+ flags |= GPIOF_ACTIVE_LOW;
ret = devm_gpio_request_one(&pdev->dev, imx6_pcie->reset_gpio,
- GPIOF_OUT_INIT_LOW, "PCIe reset");
+ flags, "PCIe reset");
if (ret) {
dev_err(&pdev->dev, "unable to get reset gpio\n");
return ret;
--
1.7.9.5
next reply other threads:[~2015-11-16 15:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-16 15:19 Petr Štetiar [this message]
2015-11-24 13:55 ` [PATCH] PCI: imx6: Fix reset-gpio to work with active low GPIO Lucas Stach
2015-11-27 10:01 ` [PATCH v2] " Petr Štetiar
2015-11-27 10:34 ` Lucas Stach
2015-11-27 10:56 ` [PATCH v3] " Petr Štetiar
2015-11-27 10:59 ` Lucas Stach
2015-12-04 20:59 ` Bjorn Helgaas
2015-12-04 21:02 ` Bjorn Helgaas
2015-12-09 15:09 ` Bjorn Helgaas
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=1447687147-19436-1-git-send-email-ynezz@true.cz \
--to=ynezz@true.cz \
--cc=Richard.Zhu@freescale.com \
--cc=bhelgaas@google.com \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).