summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2016-01-06 15:44:07 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-12-24 01:27:30 +0100
commitdf5fd2ce051ab248d9d311740ef8c90fbbe3a046 (patch)
tree5d4c6781eb2756d13043c12374b11b2ecce82c5e /drivers
parentb0a6bc58a88716a54b30429f92b30288d6fa28a0 (diff)
PCI: imx6: fix PCIe EP device self-initialisation
This fixes PCIe EP device self-initialisation in case only a regular reset EP GPIO is used as PERST# which is e.g. the case on our Ixora carrier board by always waiting 20 milliseconds after releasing PERST#. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 3eaf56fc694e8b960a29e0205f40380cf59f9fc9) (cherry picked from commit 826486c65363059986fa12fa1eeb7c0e50c3af48)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/host/pci-imx6.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index 10d66c1ba38c..8de09e39edb9 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -943,13 +943,12 @@ static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie)
mdelay(1);
if (gpio_is_valid(imx_pcie->reset_ep_gpio))
gpio_set_value_cansleep(imx_pcie->reset_ep_gpio, 0);
- mdelay(20);
} else if (gpio_is_valid(imx_pcie->reset_ep_gpio)) {
gpio_set_value_cansleep(imx_pcie->reset_ep_gpio, 1);
mdelay(100);
gpio_set_value_cansleep(imx_pcie->reset_ep_gpio, 0);
- mdelay(20);
}
+ mdelay(20);
if (ret == 0)
return ret;