From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Gregory Clement <gregory.clement@bootlin.com>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: <devicetree@vger.kernel.org>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
linux-pci@vger.kernel.org, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Antoine Tenart <antoine.tenart@bootlin.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Nadav Haklai <nadavh@marvell.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH v2 02/12] PCI: aardvark: Add reset GPIO support
Date: Wed, 12 Dec 2018 11:21:32 +0100 [thread overview]
Message-ID: <20181212102142.16053-3-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20181212102142.16053-1-miquel.raynal@bootlin.com>
The IP supports a reset GPIO. When S2RAM will be added, we must ensure
the reset line (if any) is deasserted when resuming. Add support for
it.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/pci/controller/pci-aardvark.c | 57 +++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index b95eb2aa00bb..1d31d74ddab7 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -9,6 +9,7 @@
*/
#include <linux/delay.h>
+#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/irqdomain.h>
@@ -17,6 +18,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/of_address.h>
+#include <linux/of_gpio.h>
#include <linux/of_pci.h>
#include "../pci.h"
@@ -201,6 +203,7 @@ struct advk_pcie {
u16 msi_msg;
int root_bus_nr;
struct pci_bridge_emul bridge;
+ struct gpio_desc *reset_gpio;
};
static inline void advk_writel(struct advk_pcie *pcie, u32 val, u64 reg)
@@ -973,6 +976,55 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie)
return err;
}
+static int advk_pcie_hard_reset(struct advk_pcie *pcie)
+{
+ if (!pcie->reset_gpio)
+ return -EINVAL;
+
+ gpiod_set_value_cansleep(pcie->reset_gpio, 0);
+ msleep(1);
+ gpiod_set_value_cansleep(pcie->reset_gpio, 1);
+
+ return 0;
+}
+
+static int advk_pcie_setup_reset_gpio(struct advk_pcie *pcie)
+{
+ struct device *dev = &pcie->pdev->dev;
+ enum of_gpio_flags of_flags;
+ unsigned long gpio_flags;
+ int gpio_nb;
+ int ret;
+
+ gpio_nb = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0,
+ &of_flags);
+ if (gpio_nb == -EPROBE_DEFER)
+ return gpio_nb;
+
+ /* Old bindings miss the reset GPIO handle */
+ if (!gpio_is_valid(gpio_nb)) {
+ dev_warn(dev, "Reset GPIO unavailable\n");
+ return 0;
+ }
+
+ if (of_flags & OF_GPIO_ACTIVE_LOW)
+ gpio_flags = GPIOF_ACTIVE_LOW |
+ GPIOF_OUT_INIT_LOW;
+ else
+ gpio_flags = GPIOF_OUT_INIT_HIGH;
+
+ ret = devm_gpio_request_one(dev, gpio_nb, gpio_flags,
+ "pcie-aardvark-reset");
+ if (ret) {
+ dev_err(dev, "Failed to retrieve reset GPIO (%d)\n", ret);
+ return ret;
+ }
+
+ pcie->reset_gpio = gpio_to_desc(gpio_nb);
+
+ return 0;
+}
+
static int advk_pcie_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -1008,6 +1060,11 @@ static int advk_pcie_probe(struct platform_device *pdev)
return ret;
}
+ ret = advk_pcie_setup_reset_gpio(pcie);
+ if (ret)
+ return ret;
+
+ advk_pcie_hard_reset(pcie);
advk_pcie_setup_hw(pcie);
advk_sw_pci_bridge_init(pcie);
--
2.19.1
next prev parent reply other threads:[~2018-12-12 10:23 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 10:21 [PATCH v2 00/12] Bring suspend to RAM support to PCIe Aardvark driver Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 01/12] PCI: aardvark: Configure more registers in the configuration helper Miquel Raynal
2018-12-12 10:21 ` Miquel Raynal [this message]
2018-12-12 10:21 ` [PATCH v2 03/12] PCI: aardvark: Add PHY support Miquel Raynal
2018-12-14 0:47 ` Marek Behun
2018-12-14 0:57 ` Marek Behun
2018-12-17 16:07 ` Miquel Raynal
2018-12-17 18:27 ` Baruch Siach
2018-12-18 8:12 ` Miquel Raynal
2018-12-17 21:34 ` Marek Behun
2018-12-18 8:18 ` Miquel Raynal
2018-12-18 8:23 ` Miquel Raynal
2018-12-18 13:09 ` Marek Behun
2018-12-18 13:41 ` Miquel Raynal
2018-12-19 15:28 ` Marek Behún
2018-12-19 16:48 ` Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 04/12] PCI: aardvark: Add clock support Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 05/12] PCI: aardvark: Add suspend to RAM support Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 06/12] dt-bindings: PCI: aardvark: Describe the reset-gpios property Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 07/12] dt-bindings: PCI: aardvark: Describe the clocks property Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 08/12] dt-bindings: PCI: aardvark: Describe the PHY property Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 09/12] ARM64: dts: marvell: armada-37xx: declare PCIe reset pin Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 10/12] ARM64: dts: marvell: armada-3720-espressobin: declare PCIe reset GPIO Miquel Raynal
2018-12-13 14:33 ` Miquel Raynal
2018-12-13 14:36 ` Thomas Petazzoni
2018-12-17 14:31 ` Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 11/12] ARM64: dts: marvell: armada-37xx: declare PCIe clock Miquel Raynal
2018-12-12 10:21 ` [PATCH v2 12/12] ARM64: dts: marvell: armada-3720-espressobin: declare PCIe PHY Miquel Raynal
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=20181212102142.16053-3-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=andrew@lunn.ch \
--cc=antoine.tenart@bootlin.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=maxime.chevallier@bootlin.com \
--cc=nadavh@marvell.com \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
/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).